Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'

author: Alyssa Ross <hi@alyssa.is> 2020-04-27 21:04:56 +0000
committer: Alyssa Ross <hi@alyssa.is> 2020-04-27 21:04:56 +0000
commit: a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch)
tree: 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/servers
parent: 5b00523fb58512232b819a301c4309f579c7f09c (diff)
parent: 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff)
download: nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip
361 files changed, 3293 insertions, 3576 deletions
diff --git a/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix b/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
index 02c2e03d90fa..4f7186f31404 100644
--- a/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
 
 let
-  name = "qpid-cpp-${version}";
+  pname = "qpid-cpp";
+  name = "${pname}-${version}";
   version = "1.39.0";
 
   src = fetchurl {
@@ -10,9 +11,9 @@ let
   };
 
   meta = with stdenv.lib; {
-    homepage = http://qpid.apache.org;
-    repositories.git = git://git.apache.org/qpid.git;
-    repositories.svn = http://svn.apache.org/repos/asf/qpid;
+    homepage = "http://qpid.apache.org";
+    repositories.git = "git://git.apache.org/qpid.git";
+    repositories.svn = "http://svn.apache.org/repos/asf/qpid";
     description = "An AMQP message broker and a C++ messaging API";
     license = licenses.asl20;
     platforms = platforms.linux;
@@ -20,7 +21,7 @@ let
   };
 
   qpid-cpp = stdenv.mkDerivation {
-    inherit src meta name;
+    inherit src meta pname version;
 
     nativeBuildInputs = [ cmake ];
     buildInputs = [ boost libuuid ruby python2 ];
@@ -46,7 +47,7 @@ let
   };
 
   python-frontend = buildPythonPackage {
-    inherit name meta src;
+    inherit pname version meta src;
 
     sourceRoot = "${name}/management/python";
 
diff --git a/nixpkgs/pkgs/servers/apache-kafka/default.nix b/nixpkgs/pkgs/servers/apache-kafka/default.nix
index 769f5f79a77f..a8baefa98ea0 100644
--- a/nixpkgs/pkgs/servers/apache-kafka/default.nix
+++ b/nixpkgs/pkgs/servers/apache-kafka/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://kafka.apache.org;
+    homepage = "http://kafka.apache.org";
     description = "A high-throughput distributed messaging system";
     license = licenses.asl20;
     maintainers = [ maintainers.ragge ];
diff --git a/nixpkgs/pkgs/servers/apcupsd/default.nix b/nixpkgs/pkgs/servers/apcupsd/default.nix
index bec61d460a7a..ad047ba31f86 100644
--- a/nixpkgs/pkgs/servers/apcupsd/default.nix
+++ b/nixpkgs/pkgs/servers/apcupsd/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Daemon for controlling APC UPSes";
-    homepage = http://www.apcupsd.com/;
+    homepage = "http://www.apcupsd.com/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/nixpkgs/pkgs/servers/asterisk/default.nix b/nixpkgs/pkgs/servers/asterisk/default.nix
index 1e5ba46d3823..9683d2c44d05 100644
--- a/nixpkgs/pkgs/servers/asterisk/default.nix
+++ b/nixpkgs/pkgs/servers/asterisk/default.nix
@@ -72,24 +72,24 @@ let
 
     meta = with stdenv.lib; {
       description = "Software implementation of a telephone private branch exchange (PBX)";
-      homepage = https://www.asterisk.org/;
+      homepage = "https://www.asterisk.org/";
       license = licenses.gpl2;
       maintainers = with maintainers; [ auntie DerTim1 yorickvp ];
     };
   };
 
   pjproject_2_7_1 = fetchurl {
-    url = https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2;
+    url = "https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2";
     sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
   };
 
   pjproject_2_8 = fetchurl {
-    url = https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2;
+    url = "https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2";
     sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
   };
 
   mp3-202 = fetchsvn {
-    url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
+    url = "http://svn.digium.com/svn/thirdparty/mp3/trunk";
     rev = "202";
     sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
   };
@@ -141,11 +141,11 @@ in rec {
   #    # provided here verbatim for the convenience of anyone wanting to build
   #    # Asterisk from other sources. Include in externals.
   #    "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl {
-  #      url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+  #      url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz";
   #      sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
   #    };
   #    "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl {
-  #      url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
+  #      url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz";
   #      sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
   #    };
   #    # TODO: Sounds for other languages could be added here
diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix
index db5baf6e5afb..d8410c87b766 100644
--- a/nixpkgs/pkgs/servers/atlassian/confluence.nix
+++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
 
 stdenvNoCC.mkDerivation rec {
   pname = "atlassian-confluence";
-  version = "7.2.1";
+  version = "7.3.4";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049";
+    sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi";
   };
 
   buildPhase = ''
diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix
index 81b90091e669..556380df4649 100644
--- a/nixpkgs/pkgs/servers/atlassian/crowd.nix
+++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Single sign-on and identity management tool";
-    homepage = https://www.atlassian.com/software/crowd;
+    homepage = "https://www.atlassian.com/software/crowd";
     license = licenses.unfree;
     maintainers = with maintainers; [ fpletz globin ];
   };
diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix
index 611db53d6458..d0d95d24068c 100644
--- a/nixpkgs/pkgs/servers/atlassian/jira.nix
+++ b/nixpkgs/pkgs/servers/atlassian/jira.nix
@@ -1,15 +1,18 @@
-{ stdenv, lib, fetchurl
+{ stdenv
+, lib
+, fetchurl
+, gawk
 , enableSSO ? false
 , crowdProperties ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "atlassian-jira";
-  version = "8.7.1";
+  version = "8.8.0";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz";
+    sha256 = "1gn0iknli8pi3c3kxb8hdn19wzn2fx0193ppf0niw3cqf1h2c5cz";
   };
 
   buildPhase = ''
@@ -18,6 +21,8 @@ stdenv.mkDerivation rec {
     rm -r logs; ln -sf /run/atlassian-jira/logs/ .
     rm -r work; ln -sf /run/atlassian-jira/work/ .
     rm -r temp; ln -sf /run/atlassian-jira/temp/ .
+    substituteInPlace bin/check-java.sh \
+      --replace "awk" "${gawk}/bin/gawk"
   '' + lib.optionalString enableSSO ''
     substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
       --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \
diff --git a/nixpkgs/pkgs/servers/beanstalkd/default.nix b/nixpkgs/pkgs/servers/beanstalkd/default.nix
index 58ebbf88f78a..40e6267bd7bd 100644
--- a/nixpkgs/pkgs/servers/beanstalkd/default.nix
+++ b/nixpkgs/pkgs/servers/beanstalkd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "fortify" ];
 
   meta = with stdenv.lib; {
-    homepage = http://kr.github.io/beanstalkd/;
+    homepage = "http://kr.github.io/beanstalkd/";
     description = "A simple, fast work queue";
     license = licenses.mit;
     maintainers = [ maintainers.zimbatm ];
diff --git a/nixpkgs/pkgs/servers/bird/default.nix b/nixpkgs/pkgs/servers/bird/default.nix
index 2cc27eda1d4d..e90445e29c89 100644
--- a/nixpkgs/pkgs/servers/bird/default.nix
+++ b/nixpkgs/pkgs/servers/bird/default.nix
@@ -36,7 +36,7 @@ let
 
       meta = {
         description = "BIRD Internet Routing Daemon";
-        homepage = http://bird.network.cz;
+        homepage = "http://bird.network.cz";
         license = licenses.gpl2Plus;
         maintainers = with maintainers; [ fpletz globin ];
         platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/brickd/default.nix b/nixpkgs/pkgs/servers/brickd/default.nix
index ee8925e11709..b6c5b2a60af3 100644
--- a/nixpkgs/pkgs/servers/brickd/default.nix
+++ b/nixpkgs/pkgs/servers/brickd/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = https://www.tinkerforge.com/;
+    homepage = "https://www.tinkerforge.com/";
     description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages";
     maintainers = [ stdenv.lib.maintainers.qknight ];
     license = stdenv.lib.licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/caddy/default.nix b/nixpkgs/pkgs/servers/caddy/default.nix
index 8b51e584e3ec..bcd4b7065b58 100644
--- a/nixpkgs/pkgs/servers/caddy/default.nix
+++ b/nixpkgs/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "caddy";
@@ -16,8 +16,6 @@ buildGoModule rec {
   };
   modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     cat << EOF > caddy/main.go
     package main
diff --git a/nixpkgs/pkgs/servers/caddy/v2.nix b/nixpkgs/pkgs/servers/caddy/v2.nix
index 7330388a7859..35c1f497850a 100644
--- a/nixpkgs/pkgs/servers/caddy/v2.nix
+++ b/nixpkgs/pkgs/servers/caddy/v2.nix
@@ -1,8 +1,8 @@
-{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "caddy";
-  version = "2.0.0-beta10";
+  version = "2.0.0-rc.1";
 
   goPackagePath = "github.com/caddyserver/caddy";
 
@@ -12,11 +12,9 @@ buildGoModule rec {
     owner = "caddyserver";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vagcw6ibri4nbx1n60xp7rffcfr64a2202hjaijyjzc8wcl80na";
+    sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h";
   };
-  modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv";
 
   meta = with stdenv.lib; {
     homepage = "https://caddyserver.com";
diff --git a/nixpkgs/pkgs/servers/cayley/default.nix b/nixpkgs/pkgs/servers/cayley/default.nix
index c9a39b691e7c..c62a28e41bdf 100644
--- a/nixpkgs/pkgs/servers/cayley/default.nix
+++ b/nixpkgs/pkgs/servers/cayley/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
   '';
   
   meta = {
-    homepage = https://cayley.io/;
+    homepage = "https://cayley.io/";
     description = "A graph database inspired by Freebase and Knowledge Graph";
     maintainers = with stdenv.lib.maintainers; [ sigma ];
     license = stdenv.lib.licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
index 2fb5b4035086..e81993100274 100644
--- a/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
+++ b/nixpkgs/pkgs/servers/cloud-print-connector/default.nix
@@ -54,7 +54,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector";
-    homepage = https://github.com/google/cloud-print-connector;
+    homepage = "https://github.com/google/cloud-print-connector";
     license = licenses.bsd3;
     maintainers = with maintainers; [ hodapp ];
     # TODO: Fix broken build on macOS.  The GitHub presently lists the
diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
index 13fad7059afe..bb7885025d19 100644
--- a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
+++ b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/hautreux/slurm-spank-x11;
+    homepage = "https://github.com/hautreux/slurm-spank-x11";
     description = "Plugin for SLURM to allow for interactive X11 sessions";
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix
index 18ef3bf3fa55..1554fb69f196 100644
--- a/nixpkgs/pkgs/servers/computing/slurm/default.nix
+++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.schedmd.com/;
+    homepage = "http://www.schedmd.com/";
     description = "Simple Linux Utility for Resource Management";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/computing/storm/default.nix b/nixpkgs/pkgs/servers/computing/storm/default.nix
index 8335e40de98f..d55dd14601e8 100644
--- a/nixpkgs/pkgs/servers/computing/storm/default.nix
+++ b/nixpkgs/pkgs/servers/computing/storm/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    homepage = http://storm.apache.org;
+    homepage = "http://storm.apache.org";
     description = "Distributed realtime computation system";
     license = licenses.asl20;
     maintainers = with maintainers; [ edwtjo vizanto ];
diff --git a/nixpkgs/pkgs/servers/computing/torque/default.nix b/nixpkgs/pkgs/servers/computing/torque/default.nix
index 8eb12a1b8112..37c8d32ab6a1 100644
--- a/nixpkgs/pkgs/servers/computing/torque/default.nix
+++ b/nixpkgs/pkgs/servers/computing/torque/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.adaptivecomputing.com/products/open-source/torque;
+    homepage = "http://www.adaptivecomputing.com/products/open-source/torque";
     description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids";
     platforms = platforms.linux;
     license = "TORQUEv1.1";
diff --git a/nixpkgs/pkgs/servers/confluent-platform/default.nix b/nixpkgs/pkgs/servers/confluent-platform/default.nix
index 93794ce7052e..52023b39812f 100644
--- a/nixpkgs/pkgs/servers/confluent-platform/default.nix
+++ b/nixpkgs/pkgs/servers/confluent-platform/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.confluent.io/;
+    homepage = "https://www.confluent.io/";
     description = "Confluent event streaming platform based on Apache Kafka";
     license = licenses.asl20;
     maintainers = [ maintainers.offline ];
diff --git a/nixpkgs/pkgs/servers/consul/default.nix b/nixpkgs/pkgs/servers/consul/default.nix
index 2a4361d99d2e..8703e76cb713 100644
--- a/nixpkgs/pkgs/servers/consul/default.nix
+++ b/nixpkgs/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "consul";
-  version = "1.6.2";
+  version = "1.7.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -19,7 +19,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "0r9wqxhgspgypvp9xdv931r8g28gjg9njdignp84rrbxljix25my";
+    sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4";
   };
 
   preBuild = ''
@@ -28,7 +28,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Tool for service discovery, monitoring and configuration";
-    homepage = https://www.consul.io/;
+    homepage = "https://www.consul.io/";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ];
diff --git a/nixpkgs/pkgs/servers/corosync/default.nix b/nixpkgs/pkgs/servers/corosync/default.nix
index 2d7acda90af5..5a209549d352 100644
--- a/nixpkgs/pkgs/servers/corosync/default.nix
+++ b/nixpkgs/pkgs/servers/corosync/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://corosync.org/;
+    homepage = "http://corosync.org/";
     description = "A Group Communication System with features for implementing high availability within applications";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/coturn/default.nix b/nixpkgs/pkgs/servers/coturn/default.nix
index 2fbd0bbfb3da..24dc256ba69f 100644
--- a/nixpkgs/pkgs/servers/coturn/default.nix
+++ b/nixpkgs/pkgs/servers/coturn/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = [ ./pure-configure.patch ];
 
   meta = with stdenv.lib; {
-    homepage = https://coturn.net/;
+    homepage = "https://coturn.net/";
     license = with licenses; [ bsd3 ];
     description = "A TURN server";
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/couchpotato/default.nix b/nixpkgs/pkgs/servers/couchpotato/default.nix
index 07ff725f7c9c..40941123ebc4 100644
--- a/nixpkgs/pkgs/servers/couchpotato/default.nix
+++ b/nixpkgs/pkgs/servers/couchpotato/default.nix
@@ -36,7 +36,7 @@ buildPythonApplication rec {
   meta = {
     description = "Automatic movie downloading via NZBs and torrents";
     license     = lib.licenses.gpl3;
-    homepage    = https://couchpota.to/;
+    homepage    = "https://couchpota.to/";
     maintainers = with lib.maintainers; [ fadenb ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/demoit/default.nix b/nixpkgs/pkgs/servers/demoit/default.nix
index 29d00caa0236..514b6873a1a8 100644
--- a/nixpkgs/pkgs/servers/demoit/default.nix
+++ b/nixpkgs/pkgs/servers/demoit/default.nix
@@ -17,7 +17,7 @@ buildGoPackage {
 
   meta = with stdenv.lib; {
     description = "Live coding demos without Context Switching";
-    homepage = https://github.com/dgageot/demoit;
+    homepage = "https://github.com/dgageot/demoit";
     license = licenses.asl20;
     maintainers = [ maintainers.freezeboy ];
   };
diff --git a/nixpkgs/pkgs/servers/dico/default.nix b/nixpkgs/pkgs/servers/dico/default.nix
index d2a6dc9df157..ea549cd79677 100644
--- a/nixpkgs/pkgs/servers/dico/default.nix
+++ b/nixpkgs/pkgs/servers/dico/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Flexible dictionary server and client implementing RFC 2229";
-    homepage    = https://www.gnu.org/software/dico/;
+    homepage    = "https://www.gnu.org/software/dico/";
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/dict/default.nix b/nixpkgs/pkgs/servers/dict/default.nix
index af8dc2f35234..88f31332580e 100644
--- a/nixpkgs/pkgs/servers/dict/default.nix
+++ b/nixpkgs/pkgs/servers/dict/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dictd";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
-    sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
+    sha256 = "1r413a78sa3mcrgddgdj1za34dj6mnd4dg66csqv2yz8fypm3fpf";
   };
 
   buildInputs = [ libmaa zlib ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    homepage    = http://www.dict.org;
+    homepage    = "http://www.dict.org";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ ];
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/dict/dictd-db.nix b/nixpkgs/pkgs/servers/dict/dictd-db.nix
index d79c0f4a217e..13b74a4d3f3f 100644
--- a/nixpkgs/pkgs/servers/dict/dictd-db.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-db.nix
@@ -29,31 +29,31 @@ let
    };
 in rec {
   deu2eng = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/deu-eng.tar.gz;
+    url = "mirror://sourceforge/freedict/deu-eng.tar.gz";
     sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
   }) "deu-eng" "de_DE";
   eng2deu = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/eng-deu.tar.gz;
+    url = "mirror://sourceforge/freedict/eng-deu.tar.gz";
     sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
   }) "eng-deu" "en_EN";
   nld2eng = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/nld-eng.tar.gz;
+    url = "mirror://sourceforge/freedict/nld-eng.tar.gz";
     sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";
   }) "nld-eng" "nl_NL";
   eng2nld =  makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/eng-nld.tar.gz;
+    url = "mirror://sourceforge/freedict/eng-nld.tar.gz";
     sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl";
   }) "eng-nld" "en_UK";
   eng2rus = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/eng-rus.tar.gz;
+    url = "mirror://sourceforge/freedict/eng-rus.tar.gz";
     sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry";
   }) "eng-rus" "en_UK";
   fra2eng = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/fra-eng.tar.gz;
+    url = "mirror://sourceforge/freedict/fra-eng.tar.gz";
     sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3";
   }) "fra-eng" "fr_FR";
   eng2fra = makeDictdDBFreedict (fetchurl {
-    url = mirror://sourceforge/freedict/eng-fra.tar.gz;
+    url = "mirror://sourceforge/freedict/eng-fra.tar.gz";
     sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";
   }) "eng-fra" "en_UK";
   epo2eng = makeDictdDB (fetchurl {
@@ -61,7 +61,7 @@ in rec {
     sha256 = "095xwqfc43dnm0g74i83lg03542f064jy2xbn3qnjxiwysz9ksnz";
   }) "epo-eng" "epo-eng" "eo";
   mueller_eng2rus_pkg = makeDictdDB (fetchurl {
-    url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz;
+    url = "mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz";
     sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";
   }) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK";
   mueller_enru_abbr = {
diff --git a/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
index b7dbf04026d2..2207f2c36dfb 100644
--- a/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-wiktionary.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "DICT version of English Wiktionary";
-    homepage = http://en.wiktionary.org/;
+    homepage = "http://en.wiktionary.org/";
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix b/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
index 2c97101d9cbb..0afdf442d233 100644
--- a/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
+++ b/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
          the wordnet data available to dictd and by extension for lookup with
          the dict command. '';
 
-    homepage = https://wordnet.princeton.edu/;
+    homepage = "https://wordnet.princeton.edu/";
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix
index bdbff4c00f78..b641699c733f 100644
--- a/nixpkgs/pkgs/servers/dns/bind/default.nix
+++ b/nixpkgs/pkgs/servers/dns/bind/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # requires root and the net
 
   meta = with stdenv.lib; {
-    homepage = https://www.isc.org/downloads/bind/;
+    homepage = "https://www.isc.org/downloads/bind/";
     description = "Domain name server";
     license = licenses.mpl20;
 
diff --git a/nixpkgs/pkgs/servers/dns/coredns/default.nix b/nixpkgs/pkgs/servers/dns/coredns/default.nix
index 8388968298ef..cbf29b5d7c75 100644
--- a/nixpkgs/pkgs/servers/dns/coredns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/coredns/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.6.7";
+  version = "1.6.9";
 
   goPackagePath = "github.com/coredns/coredns";
 
@@ -10,12 +10,10 @@ buildGoModule rec {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "05r0dm8h23s5dafxisya48izc2ywpn5ywvhf9q6m20qkpwr8gd10";
+    sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc";
   };
 
-  modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  modSha256 = "07mlprwa37s6qpg5wvpljbvkiqcvrcljr27qsdwz49wldhdp6im6";
 
   meta = with stdenv.lib; {
     homepage = "https://coredns.io";
diff --git a/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix b/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
index d94f34ebd21f..e65021599ad4 100644
--- a/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
+++ b/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
@@ -32,7 +32,7 @@ buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    homepage = https://facebookexperimental.github.io/doh-proxy/;
+    homepage = "https://facebookexperimental.github.io/doh-proxy/";
     description = "A proof of concept DNS-Over-HTTPS proxy";
     license = licenses.bsd3;
     maintainers = [ maintainers.qyliss ];
diff --git a/nixpkgs/pkgs/servers/dns/https-dns-proxy/default.nix b/nixpkgs/pkgs/servers/dns/https-dns-proxy/default.nix
new file mode 100644
index 000000000000..6f2cb5048034
--- /dev/null
+++ b/nixpkgs/pkgs/servers/dns/https-dns-proxy/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }:
+
+stdenv.mkDerivation rec {
+  pname = "https-dns-proxy";
+  # there are no stable releases (yet?)
+  version = "unstable-20200419";
+
+  src = fetchFromGitHub {
+    owner = "aarond10";
+    repo = "https_dns_proxy";
+    rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4";
+    sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b";
+  };
+
+  nativeBuildInputs = [ cmake gtest ];
+
+  buildInputs = [ c-ares curl libev ];
+
+  installPhase = ''
+    install -Dm555 -t $out/bin https_dns_proxy
+    install -Dm444 -t $out/share/doc/${pname} ../{LICENSE,README}.*
+  '';
+
+  # upstream wants to add tests and the gtest framework is in place, so be ready
+  # for when that happens despite there being none as of right now
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "DNS to DNS over HTTPS (DoH) proxy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
index 7756c5fa3f19..73881ff1092d 100644
--- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Authoritative-only DNS server from .cz domain registry";
-    homepage = https://knot-dns.cz;
+    homepage = "https://knot-dns.cz";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.vcunat ];
diff --git a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
index ccb9a8590590..b0be6c9b3b38 100644
--- a/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
+++ b/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
@@ -85,7 +85,7 @@ unwrapped = stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Caching validating DNS resolver, from .cz domain registry";
-    homepage = https://knot-resolver.cz;
+    homepage = "https://knot-resolver.cz";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.vcunat /* upstream developer */ ];
diff --git a/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/nixpkgs/pkgs/servers/dns/powerdns/default.nix
index 129fec2895b0..b1eae68b891b 100644
--- a/nixpkgs/pkgs/servers/dns/powerdns/default.nix
+++ b/nixpkgs/pkgs/servers/dns/powerdns/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Authoritative DNS server";
-    homepage = https://www.powerdns.com;
+    homepage = "https://www.powerdns.com";
     platforms = platforms.unix;
     broken = stdenv.isDarwin;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix
index a6477d61e984..f6a44c9193db 100644
--- a/nixpkgs/pkgs/servers/documize-community/default.nix
+++ b/nixpkgs/pkgs/servers/documize-community/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }:
+{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, nixosTests }:
 
 buildGoModule rec {
   pname = "documize-community";
@@ -15,20 +15,20 @@ buildGoModule rec {
 
   nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "edition/community.go" ];
 
+  passthru.tests = { inherit (nixosTests) documize; };
+
   postInstall = ''
     # `buildGoModule` calls `go install` (without `go build` first), so
     # `-o bin/documize` doesn't work.
     mv $out/bin/community $out/bin/documize
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
     license = licenses.agpl3;
     maintainers = with maintainers; [ ma27 elseym ];
-    homepage = https://www.documize.com/;
+    homepage = "https://www.documize.com/";
   };
 }
diff --git a/nixpkgs/pkgs/servers/echoip/default.nix b/nixpkgs/pkgs/servers/echoip/default.nix
index ae6057c34697..a8f9ad8a9126 100644
--- a/nixpkgs/pkgs/servers/echoip/default.nix
+++ b/nixpkgs/pkgs/servers/echoip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule {
   pname = "echoip";
@@ -13,8 +13,6 @@ buildGoModule {
 
   modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   outputs = [ "out" "index" ];
 
   postInstall = ''
@@ -22,8 +20,8 @@ buildGoModule {
     cp $src/index.html $index/index.html
   '';
 
-  meta = with stdenv.lib; {
-    homepage = https://github.com/mpolden/echoip;
+  meta = with lib; {
+    homepage = "https://github.com/mpolden/echoip";
     license = licenses.bsd3;
     maintainers = with maintainers; [ rvolosatovs ];
   };
diff --git a/nixpkgs/pkgs/servers/elasticmq/default.nix b/nixpkgs/pkgs/servers/elasticmq/default.nix
index c1216becaf3d..1ea669f573f0 100644
--- a/nixpkgs/pkgs/servers/elasticmq/default.nix
+++ b/nixpkgs/pkgs/servers/elasticmq/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = https://github.com/adamw/elasticmq;
+    homepage = "https://github.com/adamw/elasticmq";
     description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces";
     longDescription =
       ''
diff --git a/nixpkgs/pkgs/servers/etcd/default.nix b/nixpkgs/pkgs/servers/etcd/default.nix
index 5a693fd75291..a5083a20cb77 100644
--- a/nixpkgs/pkgs/servers/etcd/default.nix
+++ b/nixpkgs/pkgs/servers/etcd/default.nix
@@ -26,7 +26,7 @@ buildGoPackage rec {
   meta = {
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     license = licenses.asl20;
-    homepage = https://coreos.com/etcd/;
+    homepage = "https://coreos.com/etcd/";
     maintainers = with maintainers; [offline];
     platforms = with platforms; linux;
   };
diff --git a/nixpkgs/pkgs/servers/exhibitor/default.nix b/nixpkgs/pkgs/servers/exhibitor/default.nix
index 1e05c856ab5e..2d1ccaf6e26c 100644
--- a/nixpkgs/pkgs/servers/exhibitor/default.nix
+++ b/nixpkgs/pkgs/servers/exhibitor/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
   '';
   meta = with stdenv.lib; {
-    homepage = https://github.com/soabase/exhibitor;
+    homepage = "https://github.com/soabase/exhibitor";
     description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization";
     license = licenses.asl20;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/nixpkgs/pkgs/servers/fcgiwrap/default.nix
index c8ddcf438f7b..cd4d3116213f 100644
--- a/nixpkgs/pkgs/servers/fcgiwrap/default.nix
+++ b/nixpkgs/pkgs/servers/fcgiwrap/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://nginx.localdomain.pl/wiki/FcgiWrap;
+    homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap";
     description = "Simple server for running CGI applications over FastCGI";
     maintainers = with maintainers; [ lethalman ];
     platforms = with platforms; linux;
diff --git a/nixpkgs/pkgs/servers/felix/default.nix b/nixpkgs/pkgs/servers/felix/default.nix
index 7be7416d04d5..38dad5e6fe88 100644
--- a/nixpkgs/pkgs/servers/felix/default.nix
+++ b/nixpkgs/pkgs/servers/felix/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "An OSGi gateway";
-    homepage = https://felix.apache.org;
+    homepage = "https://felix.apache.org";
     license = licenses.asl20;
     maintainers = [ maintainers.sander ];
   };
diff --git a/nixpkgs/pkgs/servers/fileshare/default.nix b/nixpkgs/pkgs/servers/fileshare/default.nix
index 42f280eed23b..721efb313ebe 100644
--- a/nixpkgs/pkgs/servers/fileshare/default.nix
+++ b/nixpkgs/pkgs/servers/fileshare/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.2.4";
 
   src = fetchgit {
-    url = https://git.tkolb.de/Public/fileshare.git;
+    url = "https://git.tkolb.de/Public/fileshare.git";
     rev = "v${version}";
     sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk";
   };
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A small HTTP Server for quickly sharing files over the network";
     longDescription = "Fileshare is a simple tool for sharing the contents of a directory via a webserver and optionally allowing uploads.";
-    homepage = https://git.tkolb.de/Public/fileshare;
+    homepage = "https://git.tkolb.de/Public/fileshare";
     license = licenses.mit;
     maintainers = [ maintainers.esclear ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/servers/firebird/default.nix b/nixpkgs/pkgs/servers/firebird/default.nix
index d80508bfe44c..063eaec7dede 100644
--- a/nixpkgs/pkgs/servers/firebird/default.nix
+++ b/nixpkgs/pkgs/servers/firebird/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "SQL relational database management system";
-    homepage = https://www.firebirdnews.org;
+    homepage = "https://www.firebirdnews.org";
     license = ["IDPL" "Interbase-1.0"];
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix
index 512842b3a6a2..7ad27e78d3a8 100644
--- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix
@@ -121,7 +121,7 @@ let
 
         meta = with stdenv.lib; {
           description = "Open source, distributed, transactional key-value store";
-          homepage    = https://www.foundationdb.org;
+          homepage    = "https://www.foundationdb.org";
           license     = licenses.asl20;
           platforms   = [ "x86_64-linux" ];
           maintainers = with maintainers; [ thoughtpolice ];
diff --git a/nixpkgs/pkgs/servers/foundationdb/python.nix b/nixpkgs/pkgs/servers/foundationdb/python.nix
index e4256fab0fa9..29d1f0906df7 100644
--- a/nixpkgs/pkgs/servers/foundationdb/python.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/python.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
 
   meta = with lib; {
     description = "Python bindings for FoundationDB";
-    homepage    = https://www.foundationdb.org;
+    homepage    = "https://www.foundationdb.org";
     license     = with licenses; [ asl20 ];
     maintainers = with maintainers; [ thoughtpolice ];
   };
diff --git a/nixpkgs/pkgs/servers/foundationdb/vsmake.nix b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
index a7eedb8408b4..262ea39ca5b4 100644
--- a/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
+++ b/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
@@ -141,7 +141,7 @@ let
 
         meta = with gcc6Stdenv.lib; {
           description = "Open source, distributed, transactional key-value store";
-          homepage    = https://www.foundationdb.org;
+          homepage    = "https://www.foundationdb.org";
           license     = licenses.asl20;
           platforms   = [ "x86_64-linux" ];
           maintainers = with maintainers; [ thoughtpolice ];
diff --git a/nixpkgs/pkgs/servers/freeradius/default.nix b/nixpkgs/pkgs/servers/freeradius/default.nix
index c7d6c509f098..9c80b7e7db39 100644
--- a/nixpkgs/pkgs/servers/freeradius/default.nix
+++ b/nixpkgs/pkgs/servers/freeradius/default.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" "doc" ];
 
   meta = with stdenv.lib; {
-    homepage = https://freeradius.org/;
+    homepage = "https://freeradius.org/";
     description = "A modular, high performance free RADIUS suite";
     license = licenses.gpl2;
     maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ];
diff --git a/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
index 34757462a176..bb35ec075dde 100644
--- a/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
     inherit version;
     description = "A minimal ftp server";
     downloadPage = "http://bftpd.sf.net/download.html";
-    homepage = http://bftpd.sf.net/;
+    homepage = "http://bftpd.sf.net/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
index 5f6e7d466cfd..020d2967f3e5 100644
--- a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, secure, production-quality and standard-conformant FTP server";
-    homepage = https://www.pureftpd.org;
+    homepage = "https://www.pureftpd.org";
     license = licenses.isc; # with some parts covered by BSD3(?)
     maintainers = [ maintainers.lethalman ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/gobetween/default.nix b/nixpkgs/pkgs/servers/gobetween/default.nix
index e66d5581b3c8..ff59ad53ed1c 100644
--- a/nixpkgs/pkgs/servers/gobetween/default.nix
+++ b/nixpkgs/pkgs/servers/gobetween/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }:
+{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }:
 
 buildGoModule rec {
   pname = "gobetween";
@@ -14,10 +14,8 @@ buildGoModule rec {
   modSha256 =
     "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildPhase = ''
-    make build${stdenv.lib.optionalString enableStatic "-static"}
+    make build${lib.optionalString enableStatic "-static"}
   '';
 
   installPhase = ''
@@ -27,7 +25,7 @@ buildGoModule rec {
     cp -r config $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern & minimalistic load balancer for the Сloud era";
     homepage = "http://gobetween.io";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/servers/gopher/gofish/default.nix b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
index 1bec32e5125b..d8091c4e98d6 100644
--- a/nixpkgs/pkgs/servers/gopher/gofish/default.nix
+++ b/nixpkgs/pkgs/servers/gopher/gofish/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   	
   meta = with stdenv.lib; {
     description = "A lightweight Gopher server";
-    homepage = http://gofish.sourceforge.net/;
+    homepage = "http://gofish.sourceforge.net/";
     license = licenses.gpl2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/gortr/default.nix b/nixpkgs/pkgs/servers/gortr/default.nix
index 3e5dfc87f0ee..35c6e1452437 100644
--- a/nixpkgs/pkgs/servers/gortr/default.nix
+++ b/nixpkgs/pkgs/servers/gortr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "gortr";
@@ -12,9 +12,7 @@ buildGoModule rec {
   };
   modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/servers/gotify/default.nix b/nixpkgs/pkgs/servers/gotify/default.nix
index 275aaa5d68bc..f2014aac9fdc 100644
--- a/nixpkgs/pkgs/servers/gotify/default.nix
+++ b/nixpkgs/pkgs/servers/gotify/default.nix
@@ -1,11 +1,11 @@
 { stdenv
 , buildGoPackage
+, lib
 , fetchFromGitHub
 , buildGoModule
 , packr
 , sqlite
 , callPackage
-, Security
 }:
 
 buildGoModule rec {
@@ -28,8 +28,7 @@ buildGoModule rec {
       --replace 'Version = "unknown"' 'Version = "${version}"'
   '';
 
-  buildInputs = [ sqlite ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ sqlite ];
 
   nativeBuildInputs = [ packr ];
 
diff --git a/nixpkgs/pkgs/servers/gotty/default.nix b/nixpkgs/pkgs/servers/gotty/default.nix
index a9cf6c1da477..e7d0e6f7c65a 100644
--- a/nixpkgs/pkgs/servers/gotty/default.nix
+++ b/nixpkgs/pkgs/servers/gotty/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Share your terminal as a web application";
-    homepage = https://github.com/yudai/gotty;
+    homepage = "https://github.com/yudai/gotty";
     maintainers = with maintainers; [ ];
     license = licenses.mit;
   };
diff --git a/nixpkgs/pkgs/servers/gpm/default.nix b/nixpkgs/pkgs/servers/gpm/default.nix
index 3cd36858204e..1a5032772aba 100644
--- a/nixpkgs/pkgs/servers/gpm/default.nix
+++ b/nixpkgs/pkgs/servers/gpm/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.nico.schottelius.org/software/gpm/;
+    homepage = "https://www.nico.schottelius.org/software/gpm/";
     description = "A daemon that provides mouse support on the Linux console";
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.cygwin;
diff --git a/nixpkgs/pkgs/servers/gpsd/default.nix b/nixpkgs/pkgs/servers/gpsd/default.nix
index 8ea060a82552..4d66e666ed58 100644
--- a/nixpkgs/pkgs/servers/gpsd/default.nix
+++ b/nixpkgs/pkgs/servers/gpsd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
+    scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
     python2Packages.python
     python2Packages.wrapPython
   ];
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
       diagnostic monitoring and profiling of receivers and feeding
       location-aware applications GPS/AIS logs for diagnostic purposes.
     '';
-    homepage = http://catb.org/gpsd/;
+    homepage = "http://catb.org/gpsd/";
     license = "BSD-style";
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor rasendubi ];
diff --git a/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
index 654d96ae4e1a..ed315c854c82 100644
--- a/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
+++ b/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
@@ -1,7 +1,7 @@
 From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001
 From: Maximilian Bosch <maximilian@mbosch.me>
 Date: Fri, 6 Mar 2020 23:43:58 +0100
-Subject: [PATCH] Define configs with env vars
+Subject: [PATCH 1/2] Define configs with env vars
 
 ---
  app.php                      | 4 ++--
diff --git a/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
new file mode 100644
index 000000000000..e7f84a146fbf
--- /dev/null
+++ b/nixpkgs/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
@@ -0,0 +1,24 @@
+From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Thu, 16 Apr 2020 19:37:32 +0200
+Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
+
+---
+ helpers/PrerequisiteChecker.php | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
+index d4bf74c6..ca7686c9 100644
+--- a/helpers/PrerequisiteChecker.php
++++ b/helpers/PrerequisiteChecker.php
+@@ -8,7 +8,6 @@ class PrerequisiteChecker
+ {
+     public function checkRequirements()
+     {
+-        self::checkForConfigFile();
+         self::checkForConfigDistFile();
+         self::checkForComposer();
+         self::checkForYarn();
+-- 
+2.25.0
+
diff --git a/nixpkgs/pkgs/servers/grocy/default.nix b/nixpkgs/pkgs/servers/grocy/default.nix
index 718d4b1bcded..193f3929809a 100644
--- a/nixpkgs/pkgs/servers/grocy/default.nix
+++ b/nixpkgs/pkgs/servers/grocy/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, unzip, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "grocy";
-  version = "2.6.1";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
-    sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6";
+    sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -14,11 +14,16 @@ stdenv.mkDerivation rec {
     unzip ${src} -d .
   '';
 
-  patches = [ ./0001-Define-configs-with-env-vars.patch ];
+  patches = [
+    ./0001-Define-configs-with-env-vars.patch
+    ./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
+  ];
   patchFlags = [ "--binary" "-p1" ];
 
   dontBuild = true;
 
+  passthru.tests = { inherit (nixosTests) grocy; };
+
   installPhase = ''
     mkdir -p $out/
     cp -R . $out/
diff --git a/nixpkgs/pkgs/servers/h2/default.nix b/nixpkgs/pkgs/servers/h2/default.nix
index ff127e705e50..b7f56cfe446c 100644
--- a/nixpkgs/pkgs/servers/h2/default.nix
+++ b/nixpkgs/pkgs/servers/h2/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Java SQL database";
-    homepage = http://www.h2database.com/html/main.html;
+    homepage = "http://www.h2database.com/html/main.html";
     license = licenses.mpl20;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with maintainers; [ mahe ];
diff --git a/nixpkgs/pkgs/servers/hbase/default.nix b/nixpkgs/pkgs/servers/hbase/default.nix
index 3d05933f5130..e964e956c55b 100644
--- a/nixpkgs/pkgs/servers/hbase/default.nix
+++ b/nixpkgs/pkgs/servers/hbase/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "A distributed, scalable, big data store";
-    homepage = https://hbase.apache.org;
+    homepage = "https://hbase.apache.org";
     license = licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/headphones/default.nix b/nixpkgs/pkgs/servers/headphones/default.nix
index aab651d5a4a5..7259104d145f 100644
--- a/nixpkgs/pkgs/servers/headphones/default.nix
+++ b/nixpkgs/pkgs/servers/headphones/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2, makeWrapper }:
 
 python2.pkgs.buildPythonApplication rec {
-  name = "headphones-${version}";
+  pname = "headphones";
   version = "0.5.19";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/servers/hitch/default.nix b/nixpkgs/pkgs/servers/hitch/default.nix
index 442796b80656..c81cd80eb7a6 100644
--- a/nixpkgs/pkgs/servers/hitch/default.nix
+++ b/nixpkgs/pkgs/servers/hitch/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software";
-    homepage = https://hitch-tls.org/;
+    homepage = "https://hitch-tls.org/";
     license = licenses.bsd2;
     maintainers = [ maintainers.jflanglois ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
new file mode 100644
index 000000000000..52d2daf80b08
--- /dev/null
+++ b/nixpkgs/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
@@ -0,0 +1,46 @@
+From 80f39643bb4d25f8ffcbd92804844961b303f4d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Thu, 9 Apr 2020 07:20:46 +0100
+Subject: [PATCH] setup.py: relax dependencies
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ setup.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f53af0ee1..ff4227487 100755
+--- a/setup.py
++++ b/setup.py
+@@ -32,10 +32,10 @@ PROJECT_URLS = {
+ PACKAGES = find_packages(exclude=["tests", "tests.*"])
+ 
+ REQUIRES = [
+-    "aiohttp==3.6.1",
++    "aiohttp>=3.6.1",
+     "astral==1.10.1",
+     "async_timeout==3.0.1",
+-    "attrs==19.3.0",
++    "attrs>=19.3.0",
+     "bcrypt==3.1.7",
+     "certifi>=2019.11.28",
+     "ciso8601==2.1.3",
+@@ -47,9 +47,9 @@ REQUIRES = [
+     "pip>=8.0.3",
+     "python-slugify==4.0.0",
+     "pytz>=2019.03",
+-    "pyyaml==5.3.1",
+-    "requests==2.23.0",
+-    "ruamel.yaml==0.15.100",
++    "pyyaml>=5.2",
++    "requests>=2.22",
++    "ruamel.yaml>=0.15.100",
+     "voluptuous==0.11.7",
+     "voluptuous-serialize==2.3.0",
+ ]
+-- 
+2.25.1
+
diff --git a/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
index 258e46db1990..2c0854d0a8b4 100644
--- a/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix
@@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
-    homepage = https://github.com/home-assistant/appdaemon;
+    homepage = "https://github.com/home-assistant/appdaemon";
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg dotlambda ];
   };
diff --git a/nixpkgs/pkgs/servers/home-assistant/cli.nix b/nixpkgs/pkgs/servers/home-assistant/cli.nix
index 419462dcf850..17e5559821ed 100644
--- a/nixpkgs/pkgs/servers/home-assistant/cli.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/cli.nix
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Command-line tool for Home Assistant";
-    homepage = https://github.com/home-assistant/home-assistant-cli;
+    homepage = "https://github.com/home-assistant/home-assistant-cli";
     license = licenses.asl20;
     maintainers = with maintainers; [ dotlambda ];
   };
diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 6b18dd30f308..d19b70c426ea 100644
--- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.106.6";
+  version = "0.108.2";
   components = {
     "abode" = ps: with ps; [ ]; # missing inputs: abodepy
     "acer_projector" = ps: with ps; [ pyserial];
@@ -15,8 +15,7 @@
     "airvisual" = ps: with ps; [ pyairvisual];
     "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect
     "alarm_control_panel" = ps: with ps; [ ];
-    "alarmdecoder" = ps: with ps; [ ]; # missing inputs: alarmdecoder
-    "alarmdotcom" = ps: with ps; [ ]; # missing inputs: pyalarmdotcom
+    "alarmdecoder" = ps: with ps; [ alarmdecoder];
     "alert" = ps: with ps; [ ];
     "alexa" = ps: with ps; [ aiohttp-cors];
     "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond
@@ -55,9 +54,10 @@
     "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
     "auth" = ps: with ps; [ aiohttp-cors];
     "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic
-    "automation" = ps: with ps; [ aiohttp-cors];
+    "automation" = ps: with ps; [ ];
     "avea" = ps: with ps; [ ]; # missing inputs: avea
     "avion" = ps: with ps; [ ]; # missing inputs: avion
+    "avri" = ps: with ps; [ ]; # missing inputs: avri-api
     "awair" = ps: with ps; [ ]; # missing inputs: python_awair
     "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore
     "axis" = ps: with ps; [ ]; # missing inputs: axis
@@ -83,9 +83,10 @@
     "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
+    "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
     "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
     "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
-    "braviatv" = ps: with ps; [ getmac]; # missing inputs: bravia-tv
+    "braviatv" = ps: with ps; [ bravia-tv getmac];
     "broadlink" = ps: with ps; [ broadlink];
     "brother" = ps: with ps; [ ]; # missing inputs: brother
     "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
@@ -155,7 +156,7 @@
     "dialogflow" = ps: with ps; [ aiohttp-cors];
     "digital_ocean" = ps: with ps; [ digital-ocean];
     "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
-    "directv" = ps: with ps; [ ]; # missing inputs: directpy
+    "directv" = ps: with ps; [ ]; # missing inputs: directv
     "discogs" = ps: with ps; [ discogs_client];
     "discord" = ps: with ps; [ discordpy];
     "discovery" = ps: with ps; [ netdisco];
@@ -187,6 +188,7 @@
     "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
     "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan]
     "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
+    "edl21" = ps: with ps; [ ]; # missing inputs: pysml
     "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
     "efergy" = ps: with ps; [ ];
     "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia
@@ -217,6 +219,7 @@
     "eufy" = ps: with ps; [ ]; # missing inputs: lakeside
     "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights
     "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
+    "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz
     "facebook" = ps: with ps; [ ];
     "facebox" = ps: with ps; [ ];
     "fail2ban" = ps: with ps; [ ];
@@ -299,6 +302,7 @@
     "graphite" = ps: with ps; [ ];
     "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
     "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
+    "griddy" = ps: with ps; [ ]; # missing inputs: griddypower
     "group" = ps: with ps; [ ];
     "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer
     "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
@@ -306,8 +310,8 @@
     "habitica" = ps: with ps; [ ]; # missing inputs: habitipy
     "hangouts" = ps: with ps; [ ]; # missing inputs: hangups
     "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
-    "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony
-    "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "harmony" = ps: with ps; [ aioharmony];
+    "hassio" = ps: with ps; [ aiohttp-cors];
     "haveibeenpwned" = ps: with ps; [ ];
     "hddtemp" = ps: with ps; [ ];
     "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
@@ -318,14 +322,13 @@
     "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision
     "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1
     "history" = ps: with ps; [ aiohttp-cors sqlalchemy];
-    "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy];
     "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy];
     "hitron_coda" = ps: with ps; [ ];
     "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
     "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
     "homeassistant" = ps: with ps; [ ];
-    "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python
-    "homekit_controller" = ps: with ps; [ ]; # missing inputs: homekit[IP]
+    "homekit" = ps: with ps; [ HAP-python];
+    "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP]
     "homematic" = ps: with ps; [ pyhomematic];
     "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
     "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
@@ -342,6 +345,7 @@
     "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
     "hyperion" = ps: with ps; [ ];
     "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];
     "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
@@ -368,6 +372,7 @@
     "iota" = ps: with ps; [ ]; # missing inputs: pyota
     "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
     "ipma" = ps: with ps; [ ]; # missing inputs: pyipma
+    "ipp" = ps: with ps; [ ]; # missing inputs: pyipp
     "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia
     "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail
     "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator
@@ -427,7 +432,7 @@
     "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status
     "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy
     "lovelace" = ps: with ps; [ ];
-    "luci" = ps: with ps; [ ]; # missing inputs: openwrt-luci-rpc
+    "luci" = ps: with ps; [ openwrt-luci-rpc];
     "luftdaten" = ps: with ps; [ luftdaten];
     "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy
     "lutron" = ps: with ps; [ ]; # missing inputs: pylutron
@@ -452,7 +457,7 @@
     "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate
     "meraki" = ps: with ps; [ aiohttp-cors];
     "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird
-    "met" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "met" = ps: with ps; [ pymetno];
     "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo
     "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
     "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
@@ -466,7 +471,7 @@
     "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros
     "mill" = ps: with ps; [ ]; # missing inputs: millheater
     "min_max" = ps: with ps; [ ];
-    "minecraft_server" = ps: with ps; [ getmac]; # missing inputs: mcstatus
+    "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus
     "minio" = ps: with ps; [ minio];
     "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
     "mjpeg" = ps: with ps; [ ];
@@ -477,7 +482,6 @@
     "mold_indicator" = ps: with ps; [ ];
     "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
     "moon" = ps: with ps; [ ];
-    "mopar" = ps: with ps; [ ]; # missing inputs: motorparts
     "mpchc" = ps: with ps; [ ];
     "mpd" = ps: with ps; [ mpd2];
     "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
@@ -496,7 +500,7 @@
     "n26" = ps: with ps; [ ]; # missing inputs: n26
     "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver
     "namecheapdns" = ps: with ps; [ defusedxml];
-    "nanoleaf" = ps: with ps; [ ]; # missing inputs: pynanoleaf
+    "nanoleaf" = ps: with ps; [ pynanoleaf];
     "neato" = ps: with ps; [ pybotvac];
     "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
     "nello" = ps: with ps; [ ]; # missing inputs: pynello
@@ -508,7 +512,9 @@
     "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
     "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio
     "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
+    "nexia" = ps: with ps; [ ]; # missing inputs: nexia
     "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
+    "nextcloud" = ps: with ps; [ ]; # missing inputs: nextcloudmonitor
     "nfandroidtv" = ps: with ps; [ ];
     "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
     "nilu" = ps: with ps; [ ]; # missing inputs: niluclient
@@ -517,7 +523,7 @@
     "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail
     "no_ip" = ps: with ps; [ ];
     "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa
-    "norway_air" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "norway_air" = ps: with ps; [ pymetno];
     "notify" = ps: with ps; [ ];
     "notion" = ps: with ps; [ ]; # missing inputs: aionotion
     "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
@@ -584,6 +590,7 @@
     "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
     "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
     "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint
+    "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
     "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py
     "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
     "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client];
@@ -600,6 +607,7 @@
     "pushover" = ps: with ps; [ pushover-complete];
     "pushsafer" = ps: with ps; [ ];
     "pvoutput" = ps: with ps; [ ];
+    "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc
     "pyload" = ps: with ps; [ ];
     "python_script" = ps: with ps; [ restrictedpython];
     "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent
@@ -607,6 +615,7 @@
     "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats
     "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar
     "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
+    "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro
     "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
     "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy
     "radarr" = ps: with ps; [ ];
@@ -635,7 +644,7 @@
     "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
     "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport
     "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
-    "roku" = ps: with ps; [ ]; # missing inputs: roku
+    "roku" = ps: with ps; [ roku];
     "roomba" = ps: with ps; [ ]; # missing inputs: roombapy
     "route53" = ps: with ps; [ boto3]; # missing inputs: ipify
     "rova" = ps: with ps; [ ]; # missing inputs: rova
@@ -652,9 +661,10 @@
     "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend
     "saj" = ps: with ps; [ ]; # missing inputs: pysaj
     "salt" = ps: with ps; [ ]; # missing inputs: saltbox
-    "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket]
+    "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket]
     "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
     "scene" = ps: with ps; [ ];
+    "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
     "scrape" = ps: with ps; [ beautifulsoup4];
     "script" = ps: with ps; [ ];
     "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
@@ -677,7 +687,7 @@
     "shopping_list" = ps: with ps; [ aiohttp-cors];
     "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
     "sigfox" = ps: with ps; [ ];
-    "sighthound" = ps: with ps; [ ]; # missing inputs: simplehound
+    "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound
     "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
     "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
     "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
@@ -687,7 +697,7 @@
     "sky_hub" = ps: with ps; [ ];
     "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
     "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy
-    "slack" = ps: with ps; [ ]; # missing inputs: slacker
+    "slack" = ps: with ps; [ ]; # missing inputs: slackclient
     "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
     "slide" = ps: with ps; [ ]; # missing inputs: goslide-api
     "sma" = ps: with ps; [ ]; # missing inputs: pysma
@@ -760,6 +770,7 @@
     "tado" = ps: with ps; [ ]; # missing inputs: python-tado
     "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api
     "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
+    "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig
     "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
     "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
     "tcp" = ps: with ps; [ ];
@@ -865,7 +876,6 @@
     "waze_travel_time" = ps: with ps; [ WazeRouteCalculator];
     "weather" = ps: with ps; [ ];
     "webhook" = ps: with ps; [ aiohttp-cors];
-    "weblink" = ps: with ps; [ ];
     "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv
     "websocket_api" = ps: with ps; [ aiohttp-cors];
     "wemo" = ps: with ps; [ ]; # missing inputs: pywemo
diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix
index 2b571fe96bfc..51b6d94860cc 100644
--- a/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/nixpkgs/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.106.6";
+  hassVersion = "0.108.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -75,7 +75,9 @@ in with py.pkgs; buildPythonApplication rec {
 
   disabled = pythonOlder "3.5";
 
-  patches = [ ./relax-importlib-metadata-pyaml.patch ];
+  patches = [
+    ./0001-setup.py-relax-dependencies.patch
+  ];
 
   inherit availableComponents;
 
@@ -84,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb";
+    sha256 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l";
   };
 
   propagatedBuildInputs = [
@@ -93,38 +95,33 @@ in with py.pkgs; buildPythonApplication rec {
     pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
     setuptools voluptuous voluptuous-serialize
     # From http, frontend and recorder components and auth.mfa_modules.totp
-    sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
+    sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
-    asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco
-    hass-nabucasa defusedxml
+    asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "aiohttp==3.6.1" "aiohttp" \
-      --replace "attrs==19.2.0" "attrs" \
-      --replace "ruamel.yaml==0.15.100" "ruamel.yaml"
-  '';
-
   checkPhase = ''
     # - components' dependencies are not included, so they cannot be tested
     # - test_merge_id_schema requires pyqwikswitch
+    # - test_loader.py tries to load not-packaged dependencies
     # - unclear why test_merge fails: assert merge_log_err.call_count != 0
-    py.test --ignore tests/components -k "not test_merge_id_schema and not test_merge"
+    # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged
+    py.test --ignore tests/components --ignore tests/test_loader.py -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge"
+
     # Some basic components should be tested however
     py.test \
-      tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \
+      tests/components/{api,config,configurator,demo,discovery,frontend,group,history} \
       tests/components/{homeassistant,http,logger,script,shell_command,system_log,websocket_api}
   '';
 
   makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
 
   meta = with lib; {
-    homepage = https://home-assistant.io/;
+    homepage = "https://home-assistant.io/";
     description = "Open-source home automation platform running on Python 3";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dotlambda globin ];
+    maintainers = with maintainers; [ dotlambda globin mic92 ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/home-assistant/esphome.nix b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
index 12b36de49650..2dc023df5a27 100644
--- a/nixpkgs/pkgs/servers/home-assistant/esphome.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/esphome.nix
@@ -33,11 +33,9 @@ in python.pkgs.buildPythonApplication rec {
     protobuf
   ];
 
+  # remove all version pinning (E.g tornado==5.1.1 -> tornado)
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "protobuf==3.10.0" "protobuf~=3.10" \
-      --replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \
-      --replace "tornado==5.1.1" "tornado~=5.1"
+    sed -i -e "s/==[0-9.]*//" setup.py
   '';
 
   makeWrapperArgs = [
@@ -49,11 +47,14 @@ in python.pkgs.buildPythonApplication rec {
   ];
 
   # Platformio will try to access the network
-  doCheck = false;
+  # Instead, run the executable
+  checkPhase = ''
+    $out/bin/esphome --help > /dev/null
+  '';
 
   meta = with lib; {
     description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
-    homepage = https://esphome.io/;
+    homepage = "https://esphome.io/";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda globin ];
   };
diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index 1446518fbc5c..9e12016320c9 100644
--- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix
+++ b/nixpkgs/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 = "20200220.5";
+  version = "20200407.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1";
+    sha256 = "0krwn67bkybjb69daik6dki5hm36xs4nbfwqkh0q7ami1xr1f56d";
   };
 
   # no Python tests implemented
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Polymer frontend for Home Assistant";
-    homepage = https://github.com/home-assistant/home-assistant-polymer;
+    homepage = "https://github.com/home-assistant/home-assistant-polymer";
     license = licenses.asl20;
     maintainers = with maintainers; [ dotlambda globin ];
   };
diff --git a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
index a5c6e9d09614..1467c3b528c6 100755
--- a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
+++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
@@ -36,7 +36,9 @@ PKG_PREFERENCES = {
     # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl
     "youtube-dl": "youtube-dl-light",
     "tensorflow-bin": "tensorflow",
+    "tensorflow-bin_2": "tensorflow",
     "tensorflowWithoutCuda": "tensorflow",
+    "tensorflow-build_2": "tensorflow",
 }
 
 
@@ -79,7 +81,8 @@ def parse_components(version: str = "master"):
 # Recursively get the requirements of a component and its dependencies
 def get_reqs(components, component):
     requirements = set(components[component]["requirements"])
-    for dependency in components[component]["dependencies"]:
+    deps = components[component].get("dependencies", [])
+    for dependency in deps:
         requirements.update(get_reqs(components, dependency))
     return requirements
 
diff --git a/nixpkgs/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch b/nixpkgs/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
deleted file mode 100644
index d35e05c6cd78..000000000000
--- a/nixpkgs/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7f9155d9a..f90a0d965 100755
---- a/setup.py
-+++ b/setup.py
-@@ -38,7 +38,7 @@ REQUIRES = [
-     "attrs==19.3.0",
-     "bcrypt==3.1.7",
-     "certifi>=2019.11.28",
--    "importlib-metadata==1.5.0",
-+    "importlib-metadata>=1.3.0",
-     "jinja2>=2.10.3",
-     "PyJWT==1.7.1",
-     # PyJWT has loose dependency. We want the latest one.
-@@ -46,7 +46,7 @@ REQUIRES = [
-     "pip>=8.0.3",
-     "python-slugify==4.0.0",
-     "pytz>=2019.03",
--    "pyyaml==5.3",
-+    "pyyaml>=5.2",
-     "requests==2.22.0",
-     "ruamel.yaml==0.15.100",
-     "voluptuous==0.11.7",
diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 252365098ddc..8d8a0fceefb4 100644
--- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.41";
+  version = "2.4.43";
   pname = "apache-httpd";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k";
+    sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4";
   };
 
   # FIXME: -dev depends on -doc
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  stripDebugList = "lib modules bin";
+  stripDebugList = [ "lib" "modules" "bin" ];
 
   postInstall = ''
     mkdir -p $doc/share/doc/httpd
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Apache HTTPD, the world's most popular web server";
-    homepage    = http://httpd.apache.org/;
+    homepage    = "http://httpd.apache.org/";
     license     = licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with maintainers; [ lovek323 peti ];
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 6bad43a62f0a..d696ece82675 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/UNINETT/mod_auth_mellon;
+    homepage = "https://github.com/UNINETT/mod_auth_mellon";
     description = "An Apache module with a simple SAML 2.0 service provider";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
index d681146eee5d..583140181328 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://0pointer.de/lennart/projects/mod_dnssd;
+    homepage = "http://0pointer.de/lennart/projects/mod_dnssd";
     description = "Provide Zeroconf support via DNS-SD using Avahi";
     license = licenses.asl20;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index 2b8693f7379d..9abd08baa091 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "mod_evasive-1.10.1";
 
   src = fetchurl {
-    url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz;
+    url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz";
     sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.zdziarski.com/blog/?page_id=442;
+    homepage = "http://www.zdziarski.com/blog/?page_id=442";
     description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index a6f4f9926710..4922076266bb 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = https://github.com/FastCGI-Archives/mod_fastcgi;
+    homepage = "https://github.com/FastCGI-Archives/mod_fastcgi";
     description = "Provide support for the FastCGI protocol";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
index 6aed1481ddf3..39c568d1d499 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ apacheHttpd python2 ];
 
   meta = {
-    homepage = http://modpython.org/;
+    homepage = "http://modpython.org/";
     description = "An Apache module that embeds the Python interpreter within the server";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 0e4804c1a39a..c8f95e685ab7 100644
--- a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://github.com/GrahamDumpleton/mod_wsgi;
+    homepage = "https://github.com/GrahamDumpleton/mod_wsgi";
     description = "Host Python applications in Apache through the WSGI interface";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
index 65ec2510d342..99dd63c7ce6d 100644
--- a/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A caching proxy specialized for linux distribution files";
-    homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/;
+    homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.makefu ];
diff --git a/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix
index a9d806f9de84..3f6f00e1bdbf 100644
--- a/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/nixpkgs/pkgs/servers/http/couchdb/2.0.0.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
-    homepage = http://couchdb.apache.org;
+    homepage = "http://couchdb.apache.org";
     license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/servers/http/couchdb/default.nix b/nixpkgs/pkgs/servers/http/couchdb/default.nix
index f2e5e67dd7ac..b8807532181a 100644
--- a/nixpkgs/pkgs/servers/http/couchdb/default.nix
+++ b/nixpkgs/pkgs/servers/http/couchdb/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
-    homepage = http://couchdb.apache.org;
+    homepage = "http://couchdb.apache.org";
     license = licenses.asl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];
diff --git a/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
index 42de9904f90a..4bcb16a04ea7 100644
--- a/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/darkhttpd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Small and secure static webserver";
-    homepage    = https://unix4lyfe.org/darkhttpd/;
+    homepage    = "https://unix4lyfe.org/darkhttpd/";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ bobvanderlinden ];
     platforms   = platforms.all;
diff --git a/nixpkgs/pkgs/servers/http/gatling/default.nix b/nixpkgs/pkgs/servers/http/gatling/default.nix
index 395504e49703..bf69d902aa58 100644
--- a/nixpkgs/pkgs/servers/http/gatling/default.nix
+++ b/nixpkgs/pkgs/servers/http/gatling/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A high performance web server";
-    homepage = http://www.fefe.de/gatling/;
+    homepage = "http://www.fefe.de/gatling/";
     license = stdenv.lib.licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.the-kenny ];
diff --git a/nixpkgs/pkgs/servers/http/h2o/default.nix b/nixpkgs/pkgs/servers/http/h2o/default.nix
index d599956cfda9..999016e4bd95 100644
--- a/nixpkgs/pkgs/servers/http/h2o/default.nix
+++ b/nixpkgs/pkgs/servers/http/h2o/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Optimized HTTP/1 and HTTP/2 server";
-    homepage    = https://h2o.examp1e.net;
+    homepage    = "https://h2o.examp1e.net";
     license     = licenses.mit;
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/http/hiawatha/default.nix b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
index 4e799774569c..b731d4d0b341 100644
--- a/nixpkgs/pkgs/servers/http/hiawatha/default.nix
+++ b/nixpkgs/pkgs/servers/http/hiawatha/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.hiawatha-webserver.org;
+    homepage = "https://www.hiawatha-webserver.org";
     description = "An advanced and secure webserver";
     license = licenses.gpl2;
     platforms = platforms.unix;    # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
diff --git a/nixpkgs/pkgs/servers/http/hyp/default.nix b/nixpkgs/pkgs/servers/http/hyp/default.nix
index 3a1eb50f05be..6a16ee412f51 100644
--- a/nixpkgs/pkgs/servers/http/hyp/default.nix
+++ b/nixpkgs/pkgs/servers/http/hyp/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
-  name = "hyp-server-${version}";
+  pname = "hyp-server";
   version = "1.2.0";
 
-  src = fetchurl {
-    url    = "mirror://pypi/h/hyp-server/${name}.tar.gz";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
     sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
   };
 
   meta = with stdenv.lib; {
     description = "Hyperminimal https server";
-    homepage    = https://github.com/rnhmjoj/hyp;
+    homepage    = "https://github.com/rnhmjoj/hyp";
     license     = with licenses; [gpl3Plus mit];
     maintainers = with maintainers; [ rnhmjoj ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/http/jboss/default.nix b/nixpkgs/pkgs/servers/http/jboss/default.nix
index c5702132d280..b470a127aee5 100644
--- a/nixpkgs/pkgs/servers/http/jboss/default.nix
+++ b/nixpkgs/pkgs/servers/http/jboss/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "jboss-as-7.1.1.Final";
   src = fetchurl {
-    url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz;
+    url = "https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz";
     sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
   
   meta = with stdenv.lib; {
-    homepage = http://www.jboss.org/;
+    homepage = "http://www.jboss.org/";
     description = "Open Source J2EE application server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.sander ];
diff --git a/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
index 462151400fdd..01a07a9f5029 100644
--- a/nixpkgs/pkgs/servers/http/lighttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Lightweight high-performance web server";
-    homepage = http://www.lighttpd.net/;
+    homepage = "http://www.lighttpd.net/";
     license = stdenv.lib.licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
diff --git a/nixpkgs/pkgs/servers/http/mini-httpd/default.nix b/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
index 37a0a98d4e01..98bb27221c37 100644
--- a/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/mini-httpd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://mini-httpd.nongnu.org/;
+    homepage = "http://mini-httpd.nongnu.org/";
     description = "minimalistic high-performance web server";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/http/myserver/default.nix b/nixpkgs/pkgs/servers/http/myserver/default.nix
index 3c29ddb8e0a6..be659114d470 100644
--- a/nixpkgs/pkgs/servers/http/myserver/default.nix
+++ b/nixpkgs/pkgs/servers/http/myserver/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       built-in features.  Share your files in minutes!
     '';
 
-    homepage = https://www.gnu.org/software/myserver/;
+    homepage = "https://www.gnu.org/software/myserver/";
 
     license = lib.licenses.gpl3Plus;
 
diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 31a501332fff..67a914b6a988 100644
--- a/nixpkgs/pkgs/servers/http/nginx/generic.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix
@@ -135,7 +135,7 @@ stdenv.mkDerivation {
 
   meta = if meta != null then meta else {
     description = "A reverse proxy and lightweight webserver";
-    homepage    = http://nginx.org;
+    homepage    = "http://nginx.org";
     license     = licenses.bsd2;
     platforms   = platforms.all;
     maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ];
diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index 8626dd4a7626..b382d2891f90 100644
--- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix
+++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.17.8";
-  sha256 = "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp";
+  version = "1.17.9";
+  sha256 = "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx";
 }
diff --git a/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
index c1473ccdb1b9..d001b842f335 100644
--- a/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
+++ b/nixpkgs/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
@@ -2,38 +2,35 @@ This patch makes it possible to serve static content from Nix store paths, by
 using the hash of the store path for the ETag header.
 
 diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-index cb49ef74..f88dc77c 100644
+index cb49ef74..7b456993 100644
 --- a/src/http/ngx_http_core_module.c
 +++ b/src/http/ngx_http_core_module.c
-@@ -1583,6 +1583,7 @@ ngx_http_set_etag(ngx_http_request_t *r)
+@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r)
  {
      ngx_table_elt_t           *etag;
      ngx_http_core_loc_conf_t  *clcf;
 +    u_char                    *real, *ptr1, *ptr2;
++    ngx_err_t                 err;
  
      clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
  
-@@ -1598,16 +1599,62 @@ ngx_http_set_etag(ngx_http_request_t *r)
+@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r)
      etag->hash = 1;
      ngx_str_set(&etag->key, "ETag");
  
 -    etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
 -    if (etag->value.data == NULL) {
+-        etag->hash = 0;
+-        return NGX_ERROR;
++    err = ngx_errno;
 +    real = ngx_realpath(clcf->root.data, NULL);
++    ngx_set_errno(err);
 +
-+    if (real == NULL) {
-         etag->hash = 0;
-         return NGX_ERROR;
-     }
- 
--    etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
--                                  r->headers_out.last_modified_time,
--                                  r->headers_out.content_length_n)
--                      - etag->value.data;
 +    #define NIX_STORE_DIR "@nixStoreDir@"
 +    #define NIX_STORE_LEN @nixStoreDirLen@
 +
 +    if (r->headers_out.last_modified_time == 1
++        && real != NULL
 +        && !ngx_strncmp(real, NIX_STORE_DIR, NIX_STORE_LEN)
 +        && real[NIX_STORE_LEN] == '/'
 +        && real[NIX_STORE_LEN + 1] != '\0')
@@ -76,8 +73,12 @@ index cb49ef74..f88dc77c 100644
 +                                      r->headers_out.last_modified_time,
 +                                      r->headers_out.content_length_n)
 +                          - etag->value.data;
-+    }
-+
+     }
+ 
+-    etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
+-                                  r->headers_out.last_modified_time,
+-                                  r->headers_out.content_length_n)
+-                      - etag->value.data;
 +    ngx_free(real);
  
      r->headers_out.etag = etag;
diff --git a/nixpkgs/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix
index 4b5b4259ca43..0e87b9719859 100644
--- a/nixpkgs/pkgs/servers/http/openresty/default.nix
+++ b/nixpkgs/pkgs/servers/http/openresty/default.nix
@@ -37,7 +37,7 @@ callPackage ../nginx/generic.nix args rec {
 
   meta = {
     description = "A fast web application server built on Nginx";
-    homepage    = http://openresty.org;
+    homepage    = "http://openresty.org";
     license     = lib.licenses.bsd2;
     platforms   = lib.platforms.all;
     maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ];
diff --git a/nixpkgs/pkgs/servers/http/pshs/default.nix b/nixpkgs/pkgs/servers/http/pshs/default.nix
index 19d0b9a2641c..f83ab4642f04 100644
--- a/nixpkgs/pkgs/servers/http/pshs/default.nix
+++ b/nixpkgs/pkgs/servers/http/pshs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Pretty small HTTP server - a command-line tool to share files";
-    homepage = https://github.com/mgorny/pshs;
+    homepage = "https://github.com/mgorny/pshs";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/http/redstore/default.nix b/nixpkgs/pkgs/servers/http/redstore/default.nix
index 7d592d0256b7..80f2434e5297 100644
--- a/nixpkgs/pkgs/servers/http/redstore/default.nix
+++ b/nixpkgs/pkgs/servers/http/redstore/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An HTTP interface to Redland RDF store";
-    homepage = https://www.aelius.com/njh/redstore/;
+    homepage = "https://www.aelius.com/njh/redstore/";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = with stdenv.lib.platforms;
       linux ++ freebsd ++ gnu;
diff --git a/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock
index ccf0415d440b..34b90b3fd2f7 100644
--- a/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock
@@ -70,4 +70,4 @@ DEPENDENCIES
   showoff
 
 BUNDLED WITH
-   1.16.3
+   2.1.4
diff --git a/nixpkgs/pkgs/servers/http/showoff/default.nix b/nixpkgs/pkgs/servers/http/showoff/default.nix
index 136fcb3e07cf..0a10c806e5ed 100644
--- a/nixpkgs/pkgs/servers/http/showoff/default.nix
+++ b/nixpkgs/pkgs/servers/http/showoff/default.nix
@@ -10,7 +10,7 @@ bundlerApp {
   meta = with lib; {
     description = "A slideshow presentation tool with a twist";
     longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode";
-    homepage = https://puppetlabs.github.io/showoff/;
+    homepage = "https://puppetlabs.github.io/showoff/";
     license = with licenses; mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ mwilsoninsight nicknovitski ];
diff --git a/nixpkgs/pkgs/servers/http/tengine/default.nix b/nixpkgs/pkgs/servers/http/tengine/default.nix
index 1eeb5a8c4dd8..1593ad0c06f6 100644
--- a/nixpkgs/pkgs/servers/http/tengine/default.nix
+++ b/nixpkgs/pkgs/servers/http/tengine/default.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A web server based on Nginx and has many advanced features, originated by Taobao.";
-    homepage    = https://tengine.taobao.org;
+    homepage    = "https://tengine.taobao.org";
     license     = licenses.bsd2;
     platforms   = platforms.all;
     maintainers = with maintainers; [ izorkin ];
diff --git a/nixpkgs/pkgs/servers/http/thttpd/default.nix b/nixpkgs/pkgs/servers/http/thttpd/default.nix
index b72439bc37a2..6ff1026ba0c6 100644
--- a/nixpkgs/pkgs/servers/http/thttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/thttpd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tiny/turbo/throttling HTTP server";
-    homepage = http://www.acme.com/software/thttpd/;
+    homepage = "http://www.acme.com/software/thttpd/";
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix
index 3908db5ea71c..78e108d8c8da 100644
--- a/nixpkgs/pkgs/servers/http/tomcat/default.nix
+++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix
@@ -21,7 +21,7 @@ let
       '';
 
     meta = {
-      homepage = https://tomcat.apache.org/;
+      homepage = "https://tomcat.apache.org/";
       description = "An implementation of the Java Servlet and JavaServer Pages technologies";
       platforms = with lib.platforms; all;
       maintainers = with lib.maintainers; [ danbst ];
diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix
index c56e994ed54e..1e3ddb4ad8f1 100644
--- a/nixpkgs/pkgs/servers/http/unit/default.nix
+++ b/nixpkgs/pkgs/servers/http/unit/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, which
 , withPython2 ? false, python2
 , withPython3 ? true, python3, ncurses
-, withPHP72 ? false, php72
-, withPHP73 ? true, php73
+, withPHP72 ? false, php72base
+, withPHP73 ? true, php73base
 , withPerl528 ? false, perl528
 , withPerl530 ? true, perl530
 , withPerldevel ? false, perldevel
@@ -16,7 +16,19 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+let
+  phpConfig = {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+    config.php.systemd = false;
+    config.php.phpdbg = false;
+    config.php.cgi = false;
+    config.php.fpm = false;
+  };
+
+  php72-unit = php72base.override phpConfig;
+  php73-unit = php73base.override phpConfig;
+in stdenv.mkDerivation rec {
   version = "1.16.0";
   pname = "unit";
 
@@ -37,8 +49,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ ]
     ++ optional withPython2 python2
     ++ optionals withPython3 [ python3 ncurses ]
-    ++ optional withPHP72 php72
-    ++ optional withPHP73 php73
+    ++ optional withPHP72 php72-unit
+    ++ optional withPHP73 php73-unit
     ++ optional withPerl528 perl528
     ++ optional withPerl530 perl530
     ++ optional withPerldevel perldevel
@@ -59,8 +71,8 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     ${optionalString withPython2    "./configure python --module=python2  --config=${python2}/bin/python2-config  --lib-path=${python2}/lib"}
     ${optionalString withPython3    "./configure python --module=python3  --config=${python3}/bin/python3-config  --lib-path=${python3}/lib"}
-    ${optionalString withPHP72      "./configure php    --module=php72    --config=${php72.dev}/bin/php-config    --lib-path=${php72}/lib"}
-    ${optionalString withPHP73      "./configure php    --module=php73    --config=${php73.dev}/bin/php-config    --lib-path=${php73}/lib"}
+    ${optionalString withPHP72      "./configure php    --module=php72    --config=${php72-unit.dev}/bin/php-config    --lib-path=${php72-unit}/lib"}
+    ${optionalString withPHP73      "./configure php    --module=php73    --config=${php73-unit.dev}/bin/php-config    --lib-path=${php73-unit}/lib"}
     ${optionalString withPerl528    "./configure perl   --module=perl528  --perl=${perl528}/bin/perl"}
     ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}
     ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}
@@ -71,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Dynamic web and application server, designed to run applications in multiple languages.";
-    homepage    = https://unit.nginx.org/;
+    homepage    = "https://unit.nginx.org/";
     license     = licenses.asl20;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ izorkin ];
diff --git a/nixpkgs/pkgs/servers/http/webfs/default.nix b/nixpkgs/pkgs/servers/http/webfs/default.nix
index 79c7d9e9eca1..cb95673b5bb1 100644
--- a/nixpkgs/pkgs/servers/http/webfs/default.nix
+++ b/nixpkgs/pkgs/servers/http/webfs/default.nix
@@ -2,7 +2,7 @@
 let
   # Let's not pull the whole apache httpd package
   mime_file = fetchurl {
-    url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types;
+    url = "https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types";
     sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16";
   };
 in
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "HTTP server for purely static content";
-    homepage    = http://linux.bytesex.org/misc/webfs.html;
+    homepage    = "http://linux.bytesex.org/misc/webfs.html";
     license     = licenses.gpl2;
     platforms   = platforms.all;
     maintainers = with maintainers; [ zimbatm ];
diff --git a/nixpkgs/pkgs/servers/http/webhook/default.nix b/nixpkgs/pkgs/servers/http/webhook/default.nix
index 707b48786483..d40adb171a63 100644
--- a/nixpkgs/pkgs/servers/http/webhook/default.nix
+++ b/nixpkgs/pkgs/servers/http/webhook/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
   };
 
   meta = with lib; {
-    homepage = https://github.com/adnanh/webhook;
+    homepage = "https://github.com/adnanh/webhook";
     license = [ licenses.mit ];
     description = "incoming webhook server that executes shell commands";
   };
diff --git a/nixpkgs/pkgs/servers/http/yaws/default.nix b/nixpkgs/pkgs/servers/http/yaws/default.nix
index 109f7bc06dcd..301aec5c34be 100644
--- a/nixpkgs/pkgs/servers/http/yaws/default.nix
+++ b/nixpkgs/pkgs/servers/http/yaws/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A high performance HTTP 1.1 server in Erlang";
-    homepage = http://yaws.hyber.org;
+    homepage = "http://yaws.hyber.org";
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ goibhniu the-kenny ];
diff --git a/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/nixpkgs/pkgs/servers/hylafaxplus/default.nix
index 289ae59d379b..21e39b5f2e20 100644
--- a/nixpkgs/pkgs/servers/hylafaxplus/default.nix
+++ b/nixpkgs/pkgs/servers/hylafaxplus/default.nix
@@ -89,8 +89,8 @@ stdenv.mkDerivation {
   postInstallCheck = ''. ${./post-install-check.sh}'';
   meta = {
     description = "enterprise-class system for sending and receiving facsimiles";
-    downloadPage = https://hylafax.sourceforge.io/download.php;
-    homepage = https://hylafax.sourceforge.io;
+    downloadPage = "https://hylafax.sourceforge.io/download.php";
+    homepage = "https://hylafax.sourceforge.io";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.yarny ];
     platforms = lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/icecast/default.nix b/nixpkgs/pkgs/servers/icecast/default.nix
index 55ec611d6053..c7046ea8247e 100644
--- a/nixpkgs/pkgs/servers/icecast/default.nix
+++ b/nixpkgs/pkgs/servers/icecast/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       open standards for commuincation and interaction.
     '';
 
-    homepage = http://www.icecast.org;
+    homepage = "http://www.icecast.org";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
index 8171f61c112d..4fdc7f6d5030 100644
--- a/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
+++ b/nixpkgs/pkgs/servers/identd/nullidentdmod/default.nix
@@ -18,7 +18,7 @@
   meta = with stdenv.lib; {
     description = "Simple identd that just replies with a random string or customized userid";
     license = licenses.gpl2;
-    homepage = http://acidhub.click/NullidentdMod;
+    homepage = "http://acidhub.click/NullidentdMod";
     maintainers = with maintainers; [ das_j ];
     platforms = platforms.linux; # Must be run by systemd
   };
diff --git a/nixpkgs/pkgs/servers/identd/oidentd/default.nix b/nixpkgs/pkgs/servers/identd/oidentd/default.nix
index 85d1186f525a..e0ff9f8de384 100644
--- a/nixpkgs/pkgs/servers/identd/oidentd/default.nix
+++ b/nixpkgs/pkgs/servers/identd/oidentd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Configurable Ident protocol server";
-    homepage = https://oidentd.janikrabe.com/;
+    homepage = "https://oidentd.janikrabe.com/";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/imgproxy/default.nix b/nixpkgs/pkgs/servers/imgproxy/default.nix
index c7d0d910ac1e..faaad1ac7a71 100644
--- a/nixpkgs/pkgs/servers/imgproxy/default.nix
+++ b/nixpkgs/pkgs/servers/imgproxy/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }:
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }:
 
 buildGoModule rec {
   pname = "imgproxy";
-  version = "2.8.1";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    sha256 = "00hhgh6nrzg2blc6yl8rph5h5w7swlkbh0zgsj7xr0lkm10879pc";
+    sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8";
     rev = "v${version}";
   };
 
-  modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w";
+  modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ gobject-introspection vips ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ gobject-introspection vips ];
 
   preBuild = ''
     export CGO_LDFLAGS_ALLOW='-(s|w)'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and secure on-the-fly image processing server written in Go";
     homepage = "https://imgproxy.net";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/servers/irc/atheme/default.nix b/nixpkgs/pkgs/servers/irc/atheme/default.nix
index d7aa06102400..06119861b9f4 100644
--- a/nixpkgs/pkgs/servers/irc/atheme/default.nix
+++ b/nixpkgs/pkgs/servers/irc/atheme/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A set of services for IRC networks";
-    homepage = https://atheme.github.io/;
+    homepage = "https://atheme.github.io/";
     license = licenses.isc;
     platforms = platforms.unix;
     maintainers = with maintainers; [ leo60228 ];
diff --git a/nixpkgs/pkgs/servers/irc/charybdis/default.nix b/nixpkgs/pkgs/servers/irc/charybdis/default.nix
index ecbedcfbec8e..ebc0b47f8b7b 100644
--- a/nixpkgs/pkgs/servers/irc/charybdis/default.nix
+++ b/nixpkgs/pkgs/servers/irc/charybdis/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "IRCv3 server designed to be highly scalable";
-    homepage    = https://github.com/charybdis-ircd/charybdis;
+    homepage    = "https://github.com/charybdis-ircd/charybdis";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lassulus fpletz ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix b/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix
index cf5b572c9eb4..8b65c7870f93 100644
--- a/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/nixpkgs/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 = "http://www.ircd-hybrid.org/";
   };
 }
diff --git a/nixpkgs/pkgs/servers/irc/ngircd/default.nix b/nixpkgs/pkgs/servers/irc/ngircd/default.nix
index 5194ab278bf7..b564a9b5c961 100644
--- a/nixpkgs/pkgs/servers/irc/ngircd/default.nix
+++ b/nixpkgs/pkgs/servers/irc/ngircd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Next Generation IRC Daemon";
-    homepage    = https://ngircd.barton.de;
+    homepage    = "https://ngircd.barton.de";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/irker/default.nix b/nixpkgs/pkgs/servers/irker/default.nix
index c056a543aa1d..f91b5a73b7d0 100644
--- a/nixpkgs/pkgs/servers/irker/default.nix
+++ b/nixpkgs/pkgs/servers/irker/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "IRC client that runs as a daemon accepting notification requests";
-    homepage = https://gitlab.com/esr/irker;
+    homepage = "https://gitlab.com/esr/irker";
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/isso/default.nix b/nixpkgs/pkgs/servers/isso/default.nix
index 166555099588..bb9302479e98 100644
--- a/nixpkgs/pkgs/servers/isso/default.nix
+++ b/nixpkgs/pkgs/servers/isso/default.nix
@@ -31,7 +31,7 @@ with python2.pkgs; buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A commenting server similar to Disqus";
-    homepage = https://posativ.org/isso/;
+    homepage = "https://posativ.org/isso/";
     license = licenses.mit;
     maintainers = with maintainers; [ fgaz ];
   };
diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix
index 9d9ae4e25b43..1b01ffe5d693 100644
--- a/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/nixpkgs/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.13.467";
+  version = "0.14.365";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
-    sha256 = "1hjihafb8w9gcqdi2i8dmimbbg17c5hwwqhav3avfizq2drsrv5c";
+    sha256 = "0xvlknjhc75km12d8li50ifqpfyl6whymb6gd7ccwyd9lv9xxm27";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/servers/jellyfin/default.nix b/nixpkgs/pkgs/servers/jellyfin/default.nix
index 6cac79bdd4e2..932081ad22fe 100644
--- a/nixpkgs/pkgs/servers/jellyfin/default.nix
+++ b/nixpkgs/pkgs/servers/jellyfin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,
-  fontconfig, freetype }:
+  fontconfig, freetype, nixosTests }:
 
 let
   os = if stdenv.isDarwin then "osx" else "linux";
@@ -18,12 +18,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "jellyfin";
-  version = "10.5.0";
+  version = "10.5.4";
 
   # Impossible to build anything offline with dotnet
   src = fetchurl {
     url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
-    sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp";
+    sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y";
   };
 
   buildInputs = [
@@ -49,9 +49,13 @@ in stdenv.mkDerivation rec {
       --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
   '';
 
+  passthru.tests = {
+    smoke-test = nixosTests.jellyfin;
+  };
+
   meta =  with stdenv.lib; {
     description = "The Free Software Media System";
-    homepage = https://jellyfin.github.io/;
+    homepage = "https://jellyfin.github.io/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ nyanloutre minijackson ];
   };
diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix
index 5fe684cfe31f..b5fec49b910d 100644
--- a/nixpkgs/pkgs/servers/keycloak/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "9.0.0";
+  version = "9.0.2";
 
   src = fetchzip {
     url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
-    sha256 = "1w2d76v1rjghvdks1w32qi08gh88cd37vbf6vx0kq9a2gnhn7hip";
+    sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://www.keycloak.org/";
     description = "Identity and access management for modern applications and services";
     license     = licenses.asl20;
+    platforms   = jre.meta.platforms;
     maintainers = [ maintainers.ngerstle ];
   };
 
diff --git a/nixpkgs/pkgs/servers/kippo/default.nix b/nixpkgs/pkgs/servers/kippo/default.nix
index bec8ccbbf18d..e91c35538a25 100644
--- a/nixpkgs/pkgs/servers/kippo/default.nix
+++ b/nixpkgs/pkgs/servers/kippo/default.nix
@@ -49,7 +49,7 @@ let
     postInstall = "$out/bin/twistd --help > /dev/null";
 
     meta = with stdenv.lib; {
-      homepage = https://twistedmatrix.com/;
+      homepage = "https://twistedmatrix.com/";
       description = "Twisted, an event-driven networking engine written in Python";
       longDescription = ''
         Twisted is an event-driven networking engine written in Python
@@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
     passthru.twisted = twisted_13;
 
     meta = with stdenv.lib; {
-      homepage = https://github.com/desaster/kippo;
+      homepage = "https://github.com/desaster/kippo";
       description = "SSH Honeypot";
       longDescription = ''
         Default port is 2222. Recommend using something like this for port redirection to default SSH port:
diff --git a/nixpkgs/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix
index 547a106a3987..d401d3ada5e1 100644
--- a/nixpkgs/pkgs/servers/livepeer/default.nix
+++ b/nixpkgs/pkgs/servers/livepeer/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Official Go implementation of the Livepeer protocol";
-    homepage = https://livepeer.org;
+    homepage = "https://livepeer.org";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ elitak ];
diff --git a/nixpkgs/pkgs/servers/ma1sd/default.nix b/nixpkgs/pkgs/servers/ma1sd/default.nix
index f35bc3bb3024..a4a95197d0dc 100644
--- a/nixpkgs/pkgs/servers/ma1sd/default.nix
+++ b/nixpkgs/pkgs/servers/ma1sd/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "a federated matrix identity server; fork of mxisd";
-    homepage = https://github.com/ma1uta/ma1sd;
+    homepage = "https://github.com/ma1uta/ma1sd";
     license = licenses.agpl3;
     maintainers = with maintainers; [ mguentner ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
index 55cc4c121f0f..962d5603e472 100644
--- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://archiveopteryx.org/;
+    homepage = "http://archiveopteryx.org/";
     description = "An advanced PostgreSQL-based IMAP/POP server";
     license = licenses.postgresql;
     maintainers = [ maintainers.phunehehe ];
diff --git a/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
index 7214c08d2427..327e545adcea 100644
--- a/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
+++ b/nixpkgs/pkgs/servers/mail/clamsmtp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "SMTP filter that allows to check for viruses using the ClamAV
                    anti-virus software";
-    homepage = http://thewalter.net/stef/software/clamsmtp/;
+    homepage = "http://thewalter.net/stef/software/clamsmtp/";
     license = licenses.bsd3;
     maintainers = [ maintainers.ekleog ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
index d4bfd3c6ca57..376beac7e36f 100644
--- a/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SMTP-proxy that signs and/or verifies emails";
-    homepage = http://dkimproxy.sourceforge.net/;
+    homepage = "http://dkimproxy.sourceforge.net/";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.ekleog ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/mail/dspam/default.nix b/nixpkgs/pkgs/servers/mail/dspam/default.nix
index 44e2223960a2..6a0db5f8f8b4 100644
--- a/nixpkgs/pkgs/servers/mail/dspam/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dspam/default.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = http://nuclearelephant.com/;
+    homepage = "http://nuclearelephant.com/";
     description = "Community Driven Antispam Filter";
     license = licenses.agpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mail/exim/default.nix b/nixpkgs/pkgs/servers/mail/exim/default.nix
index dd4d1850b596..5c73042e6cbc 100644
--- a/nixpkgs/pkgs/servers/mail/exim/default.nix
+++ b/nixpkgs/pkgs/servers/mail/exim/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://exim.org/;
+    homepage = "http://exim.org/";
     description = "A mail transfer agent (MTA)";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mail/freepops/default.nix b/nixpkgs/pkgs/servers/mail/freepops/default.nix
index b4f671862f88..5f027c89af8c 100644
--- a/nixpkgs/pkgs/servers/mail/freepops/default.nix
+++ b/nixpkgs/pkgs/servers/mail/freepops/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "freepops-0.2.9";
   src = fetchurl {
-    url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz;
+    url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz";
     sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
   };
   nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
       FreePOPs is an extensible pop3 server. Its main purpose is to provide
       a pop3 interface to a webmail.
     '';
-    homepage = http://www.freepops.org/;
+    homepage = "http://www.freepops.org/";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ pierron ];
     broken = true;
diff --git a/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/nixpkgs/pkgs/servers/mail/mailhog/default.nix
index 429d735ffcd0..10b230613077 100644
--- a/nixpkgs/pkgs/servers/mail/mailhog/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mailhog/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Web and API based SMTP testing";
-    homepage = https://github.com/mailhog/MailHog;
+    homepage = "https://github.com/mailhog/MailHog";
     maintainers = with maintainers; [ disassembler ];
     license = licenses.mit;
   };
diff --git a/nixpkgs/pkgs/servers/mail/mailman/default.nix b/nixpkgs/pkgs/servers/mail/mailman/default.nix
index 2753148c9503..8a83894d88c2 100644
--- a/nixpkgs/pkgs/servers/mail/mailman/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   dontWrapPythonPrograms = true;
 
   meta = {
-    homepage = https://www.gnu.org/software/mailman/;
+    homepage = "https://www.gnu.org/software/mailman/";
     description = "Free software for managing electronic mail discussion and newsletter lists";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ peti ];
diff --git a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix
index bcb92051fc8a..5f542b9036ea 100644
--- a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix
+++ b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = https://www.gnu.org/software/mailman/;
+    homepage = "https://www.gnu.org/software/mailman/";
     description = "Web-based user interface for managing GNU Mailman";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ globin peti ];
diff --git a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
index 2c1c07e502a7..4caa9e8bfefa 100644
--- a/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
+++ b/nixpkgs/pkgs/servers/mail/mlmmj/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://mlmmj.org;
+    homepage = "http://mlmmj.org";
     description = "Mailing List Management Made Joyful";
     maintainers = [ maintainers.edwtjo ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix
index 7738c4eb3d4a..6744d1ffac12 100644
--- a/nixpkgs/pkgs/servers/mail/nullmailer/default.nix
+++ b/nixpkgs/pkgs/servers/mail/nullmailer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://untroubled.org/nullmailer/;
+    homepage = "http://untroubled.org/nullmailer/";
     description = ''
       A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays.
       It is designed to be simple to configure, secure, and easily extendable.
diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix
index 76b247cfd841..134913e85a83 100644
--- a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.opensmtpd.org/;
+    homepage = "https://www.opensmtpd.org/";
     description = ''
       A free implementation of the server-side SMTP protocol as defined by
       RFC 5321, with some additional standard extensions
diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix
index 14d36ad65549..803ba0ee6c75 100644
--- a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       " -L${libmysqlclient}/lib/mysql";
 
   meta = with stdenv.lib; {
-    homepage = https://www.opensmtpd.org/;
+    homepage = "https://www.opensmtpd.org/";
     description = "Extra plugins for the OpenSMTPD mail server";
     license = licenses.isc;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mail/petidomo/default.nix b/nixpkgs/pkgs/servers/mail/petidomo/default.nix
index c97d8e4ccf38..146160b79c32 100644
--- a/nixpkgs/pkgs/servers/mail/petidomo/default.nix
+++ b/nixpkgs/pkgs/servers/mail/petidomo/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    homepage = http://petidomo.sourceforge.net/;
+    homepage = "http://petidomo.sourceforge.net/";
     description = "A simple and easy to administer mailing list server";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/nixpkgs/pkgs/servers/mail/popa3d/default.nix b/nixpkgs/pkgs/servers/mail/popa3d/default.nix
index e14b62a85971..998dce882866 100644
--- a/nixpkgs/pkgs/servers/mail/popa3d/default.nix
+++ b/nixpkgs/pkgs/servers/mail/popa3d/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"'';
 
   meta = {
-    homepage = http://www.openwall.com/popa3d/;
+    homepage = "http://www.openwall.com/popa3d/";
     description = "Tiny POP3 daemon with security as the primary goal";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix
index 9fb441a92de3..40a2d7fe092d 100644
--- a/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/pfixtools.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A collection of postfix-related tools";
     license = with lib.licenses; [ bsd3 ];
-    homepage = https://github.com/Fruneau/pfixtools;
+    homepage = "https://github.com/Fruneau/pfixtools";
     platforms = stdenv.lib.platforms.linux;
     maintainers = with lib.maintainers; [ jerith666 ];
   };
diff --git a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
index 8f85bc5f6d6d..e6451cddec6d 100644
--- a/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec {
   '';
 
   meta = {
-    homepage = http://jimsun.linxnet.com/postfix_contrib.html;
+    homepage = "http://jimsun.linxnet.com/postfix_contrib.html";
     maintainers = with stdenv.lib.maintainers; [ schneefux ];
     description = "Postfix activity overview";
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/servers/mail/postgrey/default.nix b/nixpkgs/pkgs/servers/mail/postgrey/default.nix
index 0abfc00fdd66..dffe0191a0a4 100644
--- a/nixpkgs/pkgs/servers/mail/postgrey/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postgrey/default.nix
@@ -17,7 +17,7 @@ in runCommand name {
   };
   meta = with stdenv.lib; {
     description = "A postfix policy server to provide greylisting";
-    homepage = https://postgrey.schweikert.ch/;
+    homepage = "https://postgrey.schweikert.ch/";
     platforms = postfix.meta.platforms;
     license = licenses.gpl2;
   };
diff --git a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
index 49854927e57f..845c42374322 100644
--- a/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postsrsd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake help2man ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/roehling/postsrsd;
+    homepage = "https://github.com/roehling/postsrsd";
     description = "Postfix Sender Rewriting Scheme daemon";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
index 5da94ca80269..cbc63ff535a1 100644
--- a/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
+++ b/nixpkgs/pkgs/servers/mail/pypolicyd-spf/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    homepage = https://launchpad.net/pypolicyd-spf/;
+    homepage = "https://launchpad.net/pypolicyd-spf/";
     description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
     maintainers = with maintainers; [ abbradar ];
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix
index 79020ce78488..7f54b97a8e82 100644
--- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix
+++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, cmake, perl
 , glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
-, hyperscan, jemalloc, openblas, lua, libsodium
+, hyperscan, jemalloc, blas, lapack, lua, libsodium
 , withBlas ? true
 , withHyperscan ? stdenv.isx86_64
 , withLuaJIT ? stdenv.isx86_64
@@ -10,19 +10,19 @@ assert withHyperscan -> stdenv.isx86_64;
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "15rdxcvnfn3fzjpjz6z2ljrzhlmhn2y4sxz09z2789k442n4m1qv";
+    sha256 = "01fhh07dddc6v7a5kq6h1z221vl0d4af43cchqkf54ycyxxxw06h";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
   buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ]
     ++ lib.optional withHyperscan hyperscan
-    ++ lib.optional withBlas openblas
+    ++ lib.optionals withBlas [ blas lapack ]
     ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
 
   cmakeFlags = [
diff --git a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
index 6980dca94035..c474c501cee8 100644
--- a/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
+++ b/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
@@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec {
   '';
 
   meta = {
-    homepage = http://spamassassin.apache.org/;
+    homepage = "http://spamassassin.apache.org/";
     description = "Open-Source Spam Filter";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/servers/mail/sympa/default.nix b/nixpkgs/pkgs/servers/mail/sympa/default.nix
index 46cbcc61f94c..c5c9b4400494 100644
--- a/nixpkgs/pkgs/servers/mail/sympa/default.nix
+++ b/nixpkgs/pkgs/servers/mail/sympa/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, perl, fetchFromGitHub, autoreconfHook
-}:
+{ stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }:
 
 let
   dataDir = "/var/lib/sympa";
@@ -64,16 +63,17 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "sympa";
-  version = "6.2.52";
+  version = "6.2.54";
 
   src = fetchFromGitHub {
     owner = "sympa-community";
     repo = pname;
     rev = version;
-    sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh";
+    sha256 = "07wfvr8rrg7pwkl2zglrdri7n42rl9gwrjbaffb8m37wq67s7fca";
   };
 
   configureFlags = [
+    "--enable-fhs"
     "--without-initdir"
     "--without-unitsdir"
     "--without-smrshdir"
@@ -106,6 +106,10 @@ stdenv.mkDerivation rec {
     rm -rf "$TMP/bin"
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) sympa;
+  };
+
   meta = with stdenv.lib; {
     description = "Open source mailing list manager";
     homepage = "https://www.sympa.org";
diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index f0c8a0d4f819..87c6b6a6cc96 100644
--- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680";
+    sha256 = "0l3a5dvnahrzwqh8p0cnfr019bxxgd769jk2wprfvfd65h7p0g1r";
   };
 
   patches = [
@@ -85,7 +85,7 @@ in buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://matrix.org;
+    homepage = "https://matrix.org";
     description = "Matrix reference homeserver";
     license = licenses.asl20;
     maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ];
diff --git a/nixpkgs/pkgs/servers/matterbridge/default.nix b/nixpkgs/pkgs/servers/matterbridge/default.nix
index 2eec5d52bb9c..1f39278de625 100644
--- a/nixpkgs/pkgs/servers/matterbridge/default.nix
+++ b/nixpkgs/pkgs/servers/matterbridge/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildGoModule, fetchurl, Security }:
+{ stdenv, buildGoModule, fetchurl }:
 
 buildGoModule rec {
   pname = "matterbridge";
-  version = "1.16.5";
+  version = "1.17.1";
 
   goPackagePath = "github.com/42wim/matterbridge";
-  modSha256 = "0nnp9jxdsr2bs1pg00vd7wpv452iyxws8g3ljzypkb7hzlphcxqh";
+  modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij";
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d";
+    sha256 = "0xf0s1bvlzqnxz2kvqx1h9gmgqxdlf34s27s3zradi8fwd8hriv6";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
     homepage = "https://github.com/42wim/matterbridge";
diff --git a/nixpkgs/pkgs/servers/mattermost/default.nix b/nixpkgs/pkgs/servers/mattermost/default.nix
index 00f74e7a01ec..6327921aaac8 100644
--- a/nixpkgs/pkgs/servers/mattermost/default.nix
+++ b/nixpkgs/pkgs/servers/mattermost/default.nix
@@ -50,7 +50,7 @@ in
 
     meta = with stdenv.lib; {
       description = "Open-source, self-hosted Slack-alternative";
-      homepage = https://www.mattermost.org;
+      homepage = "https://www.mattermost.org";
       license = with licenses; [ agpl3 asl20 ];
       maintainers = with maintainers; [ fpletz ryantm ];
       platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix
index 73a008d3fe7c..1b64fb73184b 100644
--- a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix
+++ b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix
@@ -4,12 +4,12 @@ with python3.pkgs;
 
 buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "0.7.1";
+  version = "0.7.2";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yi4h37lhlpa095hzd0gwn1ifbycq8878kj5n2sjhw8kk6nblda9";
+    sha256 = "1ahchkhrhyd160fwlg6g0d2v8v56j9f3h9rnm71nxibgfjcb6m3n";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/tulir/mautrix-telegram;
+    homepage = "https://github.com/tulir/mautrix-telegram";
     description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
     license = licenses.agpl3Plus;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
index 648b4830661d..924209174e7d 100644
--- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
-  version = "2020-03-26";
+  version = "2020-04-12";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "mautrix-whatsapp";
-    rev = "3a9642386cdff8293657c8409da4bffd674184bf";
-    sha256 = "183ghrm83vlnalmlxq69xinvkylnxwmz41wwm5s4035arizkjh1b";
+    rev = "44bb623e7a7486a0cdd13fd67b2aaca2ddba20ce";
+    sha256 = "1fwxn6511pq9fdc8d2jp4vgkm1zag55pig75qdxfn63hl3i2607k";
   };
 
-  modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp";
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  modSha256 = "04pdap1q7zsa1wv2h0j9104fawn95g37yqslmp2mq7722hiqhp9x";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/tulir/mautrix-whatsapp;
+    homepage = "https://github.com/tulir/mautrix-whatsapp";
     description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
     license = licenses.agpl3;
     maintainers = with maintainers; [ vskilet ma27 ];
diff --git a/nixpkgs/pkgs/servers/mediatomb/default.nix b/nixpkgs/pkgs/servers/mediatomb/default.nix
index 33151c4063b3..17bfdef2a30d 100644
--- a/nixpkgs/pkgs/servers/mediatomb/default.nix
+++ b/nixpkgs/pkgs/servers/mediatomb/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
                   pkgconfig autoreconfHook ];
 
   meta = with stdenv.lib; {
-    homepage = http://mediatomb.cc;
-    repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb;
+    homepage = "http://mediatomb.cc";
+    repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb";
     description = "UPnP MediaServer with a web user interface";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
diff --git a/nixpkgs/pkgs/servers/memcached/default.nix b/nixpkgs/pkgs/servers/memcached/default.nix
index 0449144b07a2..89d3220aa695 100644
--- a/nixpkgs/pkgs/servers/memcached/default.nix
+++ b/nixpkgs/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, cyrus_sasl, libevent}:
+{stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.6.3";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "12qn8m0jdvdckz53m2akrvixbrn64g5kv6r4hl5vx286qhc02wh6";
+    sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w";
   };
 
   configureFlags = [
@@ -21,10 +21,13 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A distributed memory object caching system";
-    repositories.git = https://github.com/memcached/memcached.git;
+    repositories.git = "https://github.com/memcached/memcached.git";
     homepage = "http://memcached.org/";
     license = licenses.bsd3;
     maintainers = [ maintainers.coconnor ];
     platforms = platforms.linux ++ platforms.darwin;
   };
+  passthru.tests = {
+    smoke-tests = nixosTests.memcached;
+  };
 }
diff --git a/nixpkgs/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix
index 2a4ac3e17764..b2e040748ab3 100644
--- a/nixpkgs/pkgs/servers/metabase/default.nix
+++ b/nixpkgs/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.34.3";
+  version = "0.35.1";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "0kvjqdzr9zb65c2kaqb39x8s71ynpp56aax2h1x37rds4zxdg2yg";
+    sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix
index dd06c358358b..bb841da74d20 100644
--- a/nixpkgs/pkgs/servers/miniflux/default.nix
+++ b/nixpkgs/pkgs/servers/miniflux/default.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Minimalist and opinionated feed reader";
-    homepage = https://miniflux.app/;
+    homepage = "https://miniflux.app/";
     license = licenses.asl20;
     maintainers = with maintainers; [ rvolosatovs benpye ];
   };
diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix
index 1fae973066aa..953cc9fb77cd 100644
--- a/nixpkgs/pkgs/servers/minio/default.nix
+++ b/nixpkgs/pkgs/servers/minio/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "minio";
-  version = "2020-03-06T22-23-56Z";
+  version = "2020-03-25T07-03-04Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0h5zsdxm2b2by6lzqaa7jj0z773kjr89cl13gq9ddabml34f0kxh";
+    sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5";
   };
 
-  modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+  modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k";
 
   subPackages = [ "." ];
 
@@ -22,7 +20,7 @@ buildGoModule rec {
   ''];
 
   meta = with stdenv.lib; {
-    homepage = https://www.minio.io/;
+    homepage = "https://www.minio.io/";
     description = "An S3-compatible object storage server";
     maintainers = with maintainers; [ eelco bachp ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/misc/airsonic/default.nix b/nixpkgs/pkgs/servers/misc/airsonic/default.nix
index d8501878435b..2c529ef7b32b 100644
--- a/nixpkgs/pkgs/servers/misc/airsonic/default.nix
+++ b/nixpkgs/pkgs/servers/misc/airsonic/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Personal media streamer";
-    homepage = https://airsonic.github.io;
+    homepage = "https://airsonic.github.io";
     license = stdenv.lib.licenses.gpl3;
     platforms = platforms.all;
     maintainers = with maintainers; [ disassembler ];
diff --git a/nixpkgs/pkgs/servers/misc/subsonic/default.nix b/nixpkgs/pkgs/servers/misc/subsonic/default.nix
index a7041fc57d05..9f7559872b9f 100644
--- a/nixpkgs/pkgs/servers/misc/subsonic/default.nix
+++ b/nixpkgs/pkgs/servers/misc/subsonic/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://subsonic.org;
+    homepage = "http://subsonic.org";
     description = "Personal media streamer";
     license = licenses.unfree;
     maintainers = with maintainers; [ telotortium ];
diff --git a/nixpkgs/pkgs/servers/misc/taskserver/default.nix b/nixpkgs/pkgs/servers/misc/taskserver/default.nix
index 0ab921a6f6f8..e5024e6694ef 100644
--- a/nixpkgs/pkgs/servers/misc/taskserver/default.nix
+++ b/nixpkgs/pkgs/servers/misc/taskserver/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Server for synchronising Taskwarrior clients";
-    homepage = https://taskwarrior.org;
+    homepage = "https://taskwarrior.org";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
diff --git a/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
index 957bb59b1214..22c741024b21 100644
--- a/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/bosun/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
   meta = with lib; {
     description = "Time Series Alerting Framework";
     license = licenses.mit;
-    homepage = https://bosun.org;
+    homepage = "https://bosun.org";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
index 715a52ec99c2..426dd2ad2a23 100644
--- a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Analyzes resource usage and performance characteristics of running docker containers";
-    homepage = https://github.com/google/cadvisor;
+    homepage = "https://github.com/google/cadvisor";
     license = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
index cafccfeb8f28..9bece7cb2e0b 100644
--- a/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";
-    homepage = https://github.com/AcalephStorage/consul-alerts;
+    homepage = "https://github.com/AcalephStorage/consul-alerts";
     # As per README
     platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
index 572535b7fcd0..b738e36cf89a 100644
--- a/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
       metrics from a DigitalOcean Droplet (on which the program runs) and sends
       them to DigitalOcean to provide resource usage graphs and alerting.
     '';
-    homepage = https://github.com/digitalocean/do-agent;
+    homepage = "https://github.com/digitalocean/do-agent";
     license = licenses.asl20;
     maintainers = with maintainers; [ yvt ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
index 27e3cfdab9d1..42b07e605a0b 100644
--- a/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -17,12 +17,12 @@ perlPackages.buildPerlPackage rec {
     ./remove_software_test.patch
     # support for os-release file
     (fetchurl {
-      url = https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff;
+      url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff";
       sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb";
     })
     # support for Nix software inventory
     (fetchurl {
-      url = https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff;
+      url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff";
       sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw";
     })
     ];
@@ -85,7 +85,7 @@ perlPackages.buildPerlPackage rec {
   outputs = [ "out" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.fusioninventory.org;
+    homepage = "http://www.fusioninventory.org";
     description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ maintainers.phile314 ];
diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix
index 502ff10b0929..24756cc8bd2f 100644
--- a/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
 
   meta = {
     description = "PDF report generator from a Grafana dashboard";
-    homepage = https://github.com/IzakMarais/reporter;
+    homepage = "https://github.com/IzakMarais/reporter";
     license = licenses.mit;
     maintainers = with maintainers; [ disassembler ];
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index ff283396e223..ac50717208aa 100644
--- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.7.1";
+  version = "6.7.2";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0isidfnny4rds9mq7gfm3qmsjsg9higiqliri5zy5bc68lz1gnbz";
+    sha256 = "03f6f9caxphrfbps0ljwwiq246vfjlznd8xs7a7va7kb823ff5li";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0pa5g9pgifdi49vklcxnip2a156f5x64i9r2pshdg4gxfdqbxkxy";
+    sha256 = "0sgpc34jfldi0hkbqx9idkzm1n1jy82yhg29kdsvndxvi44z49lv";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/servers/monitoring/heapster/default.nix b/nixpkgs/pkgs/servers/monitoring/heapster/default.nix
index 39c048576388..2460cc633ebe 100644
--- a/nixpkgs/pkgs/servers/monitoring/heapster/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/heapster/default.nix
@@ -20,7 +20,7 @@ buildGoPackage rec {
   meta = with lib; {
     description = "Compute Resource Usage Analysis and Monitoring of Container Clusters";
     license = licenses.asl20;
-    homepage = https://github.com/kubernetes/heapster;
+    homepage = "https://github.com/kubernetes/heapster";
     maintainers = with maintainers; [ offline ];
     platforms = docker.meta.platforms;
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
index f33a418fe5ce..eb4face42aa3 100644
--- a/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
   meta = with lib; {
     description = "Open source framework for processing, monitoring, and alerting on time series data";
     license = licenses.mit;
-    homepage = https://influxdata.com/time-series-platform/kapacitor/;
+    homepage = "https://influxdata.com/time-series-platform/kapacitor/";
     maintainers = with maintainers; [offline];
     platforms = with platforms; linux;
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
index cc67bdfa56db..927c7945b916 100644
--- a/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Client/server suite for controlling a wide variety of LCD devices";
-    homepage    = http://lcdproc.org/;
+    homepage    = "http://lcdproc.org/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix
index b5e63a3aed42..a4117d923e37 100644
--- a/nixpkgs/pkgs/servers/monitoring/loki/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
 
 buildGoPackage rec {
-  version = "1.3.0";
+  version = "1.4.0";
   pname = "grafana-loki";
   goPackagePath = "github.com/grafana/loki";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "loki";
-    sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q";
+    sha256 = "0dz0icbkwpmysl5jyljmj783xdzrbbxbfxfkizw7gcs8jjxbqvfl";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/servers/monitoring/longview/default.nix b/nixpkgs/pkgs/servers/monitoring/longview/default.nix
index 5459d58ceb9f..c5c284b7f02f 100644
--- a/nixpkgs/pkgs/servers/monitoring/longview/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/longview/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.linode.com/longview;
+    homepage = "https://www.linode.com/longview";
     description = "Longview collects all of your system-level metrics and sends them to Linode";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rvl ];
diff --git a/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
index 75b58b65a9cc..64966e183fea 100644
--- a/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/mtail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "mtail";
@@ -14,8 +14,6 @@ buildGoModule rec {
   modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
   subPackages = [ "cmd/mtail" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     go generate -x ./internal/vm/
   '';
@@ -24,7 +22,7 @@ buildGoModule rec {
     "-ldflags=-X main.Version=${version}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.asl20;
     homepage = "https://github.com/google/mtail";
     description = "Tool for extracting metrics from application logs";
diff --git a/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/nixpkgs/pkgs/servers/monitoring/munin/default.nix
index 22f768b94e1f..02a81bfe33cc 100644
--- a/nixpkgs/pkgs/servers/monitoring/munin/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.51";
+  version = "2.0.59";
   pname = "munin";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "1r018lbk1dncg6v3ai7wvnk1qr4ddsjc5g605dq086z0l0xg7ras";
+    sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97";
   };
 
   buildInputs = [
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
       interface. Munin can help analyze resource trends and 'what just happened
       to kill our performance?' problems.
     '';
-    homepage = http://munin-monitoring.org/;
+    homepage = "http://munin-monitoring.org/";
     license = licenses.gpl2;
     maintainers = [ maintainers.domenkozar maintainers.bjornfor ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
index 006d91ef74eb..dc0ad6ae2cf2 100644
--- a/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/nagios/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A host, service and network monitoring program";
-    homepage    = https://www.nagios.org/;
+    homepage    = "https://www.nagios.org/";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ];
diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
index ed2abbc7fc8a..3c8005a16dfd 100644
--- a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Clients and server for the SNMP network monitoring protocol";
-    homepage = http://net-snmp.sourceforge.net/;
+    homepage = "http://net-snmp.sourceforge.net/";
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 2dc1bdf9681c..9413b5e73b6c 100644
--- a/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "System-wide monitoring for newrelic";
-    homepage = https://newrelic.com/;
+    homepage = "https://newrelic.com/";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lnl7 ];
diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
index f72fa16cd122..8f1c08bebd88 100644
--- a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix
@@ -78,7 +78,7 @@ _EOF
 
   meta = {
     description = "Official monitoring plugins for Nagios/Icinga/Sensu and others.";
-    homepage    = https://www.monitoring-plugins.org;
+    homepage    = "https://www.monitoring-plugins.org";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ thoughtpolice relrod ];
diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix
index dfa13c805e59..897d6395f95a 100644
--- a/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix
@@ -30,7 +30,7 @@ in python2Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python2Packages; [ pywbem ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.claudiokuenzler.com/nagios-plugins/;
+    homepage = "https://www.claudiokuenzler.com/nagios-plugins/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index a703c80b61a4..8464d4f1b2f8 100644
--- a/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -43,7 +43,7 @@ let
     '';
 
     meta = with stdenv.lib; {
-      homepage    = https://labs.consol.de/;
+      homepage    = "https://labs.consol.de/";
       license     = licenses.gpl2;
       maintainers = with maintainers; [ peterhoeg ];
       inherit description;
diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
index 9b4f3144a372..d4861309fe58 100644
--- a/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
+++ b/nixpkgs/pkgs/servers/monitoring/plugins/uptime.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Uptime check plugin for Sensu/Nagios/others";
-    homepage    = https://github.com/madrisan/nagios-plugins-uptime;
+    homepage    = "https://github.com/madrisan/nagios-plugins-uptime";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 759d2abfad09..de6d834c4d66 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -31,7 +31,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Alert dispatcher for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/alertmanager;
+    homepage = "https://github.com/prometheus/alertmanager";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz globin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
index 07c8a14ce0b3..d27fd094aa66 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter for bind9 server";
-    homepage = https://github.com/digitalocean/bind_exporter;
+    homepage = "https://github.com/digitalocean/bind_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ rtreffer ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index ce4bacfc9b7c..95b6c0640344 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Relay server for exporting metrics from collectd to Prometheus";
-    homepage = https://github.com/prometheus/collectd_exporter;
+    homepage = "https://github.com/prometheus/collectd_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix
index aaee2e8d770d..4267d8d34c11 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter for Consul metrics";
-    homepage = https://github.com/prometheus/consul_exporter;
+    homepage = "https://github.com/prometheus/consul_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ hectorj ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
index a01f4559a118..d0b413a10a01 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,13 @@
 { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
 
 let
-  version = "2.16.0";
+  version = "2.17.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "1bfcl3bvjb991ic8jw6y6i9pn7y03v8gwzzc78j1k5lhpqzbxkzd";
+    sha256 = "0ai9l7gx25x5m07617c0cjzwxknywwq822fn2q5b850hvs48whyv";
   };
 
   webui = mkYarnPackage {
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 773fddd311bb..c8013e6bc15c 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dnsmasq_exporter";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A dnsmasq exporter for Prometheus";
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 95b0db7dbc60..997b8784a1c5 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)";
-    homepage = https://github.com/ndecker/fritzbox_exporter;
+    homepage = "https://github.com/ndecker/fritzbox_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ bachp flokli ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 4a84db38f78d..aaff022df89f 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "HAProxy Exporter for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/haproxy_exporter;
+    homepage = "https://github.com/prometheus/haproxy_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
index ca1dc83e96ad..05e0d4cb079f 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/prometheus/jmx_exporter;
+    homepage = "https://github.com/prometheus/jmx_exporter";
     description = "A process for exposing JMX Beans via HTTP for Prometheus consumption";
     license = licenses.asl20;
     maintainers = [ maintainers.offline ];
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix
index 4d92532c90e1..c020817edc05 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -23,7 +23,7 @@ buildGoPackage {
 
   meta = with lib; {
     description = "A prometheus exporter which scrapes remote JSON by JSONPath";
-    homepage = https://github.com/kawamuray/prometheus-json-exporter;
+    homepage = "https://github.com/kawamuray/prometheus-json-exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ willibutz ];
   };
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 04fbc7fbed93..ce0404628051 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Export Mesos metrics to Prometheus";
-    homepage = https://github.com/prometheus/mesos_exporter;
+    homepage = "https://github.com/prometheus/mesos_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
index 96526d246a6d..12341eee911e 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mikrotik-exporter-unstable";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Prometheus MikroTik device(s) exporter";
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 7d4607738027..c329050d4d1a 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "A Prometheus exporter for Minio cloud storage server";
-    homepage = https://github.com/joe-pll/minio-exporter;
+    homepage = "https://github.com/joe-pll/minio-exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ bachp ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
index f5c438a87dc1..3ef947b28738 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter for MySQL server metrics";
-    homepage = https://github.com/prometheus/mysqld_exporter;
+    homepage = "https://github.com/prometheus/mysqld_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley globin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 857a7667c13f..584382b47b73 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter for machine metrics";
-    homepage = https://github.com/prometheus/node_exporter;
+    homepage = "https://github.com/prometheus/node_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz globin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
index c101e55bc871..101a53e7bb3a 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Tool to scrape a Prometheus client and dump the result as JSON";
-    homepage = https://github.com/prometheus/prom2json;
+    homepage = "https://github.com/prometheus/prom2json";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 0a707519c64e..0cb41f099c67 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -41,7 +41,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
-    homepage = https://github.com/prometheus/pushgateway;
+    homepage = "https://github.com/prometheus/pushgateway";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index c6af09743ce9..915a481ad0f4 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -18,7 +18,7 @@ buildGoPackage {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter for RabbitMQ";
-    homepage = https://github.com/kbudde/rabbitmq_exporter;
+    homepage = "https://github.com/kbudde/rabbitmq_exporter";
     license = licenses.mit;
     maintainers = with maintainers; [ ocharles ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 612066edb6d4..ed2ed29ab898 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "SNMP Exporter for Prometheus";
-    homepage = https://github.com/prometheus/snmp_exporter;
+    homepage = "https://github.com/prometheus/snmp_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ oida willibutz ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
index f4aa8344f777..cc6b55cac220 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Receives StatsD-style metrics and exports them to Prometheus";
-    homepage = https://github.com/prometheus/statsd_exporter;
+    homepage = "https://github.com/prometheus/statsd_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ivan ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 07b5055831e7..8502b76f708a 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Arris Surfboard signal metrics exporter";
-    homepage = https://github.com/ipstatic/surfboard_exporter;
+    homepage = "https://github.com/ipstatic/surfboard_exporter";
     license = licenses.mit;
     maintainers = with maintainers; [ disassembler ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix
index ef971ce04746..9fa798846878 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Prometheus exporter that exposes metrics from a Tor daemon";
-    homepage = https://github.com/atx/prometheus-tor_exporter;
+    homepage = "https://github.com/atx/prometheus-tor_exporter";
     license = licenses.mit;
     maintainers = with maintainers; [ delroth ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 5682c3ccd2a0..b4f58d789f6f 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
-    homepage = https://github.com/mdlayher/unifi_exporter;
+    homepage = "https://github.com/mdlayher/unifi_exporter";
     license = licenses.mit;
     maintainers = with maintainers; [ bachp globin ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index a0e3c6b1783c..d77675671950 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }:
 
 buildGoModule rec {
   pname = "prometheus_varnish_exporter";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   postInstall = ''
     wrapProgram $out/bin/prometheus_varnish_exporter \
       --prefix PATH : "${varnish}/bin"
@@ -24,10 +22,10 @@ buildGoModule rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
     description = "Varnish exporter for Prometheus";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MostAwesomeDude willibutz ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json
index 71b9a45f9067..5ae33ae62dfa 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json
@@ -18,6 +18,7 @@
     "@types/react-resize-detector": "^4.0.2",
     "@types/sanitize-html": "^1.20.2",
     "bootstrap": "^4.2.1",
+    "css.escape": "^1.5.1",
     "downshift": "^3.2.2",
     "enzyme-to-json": "^3.4.3",
     "fuzzy": "^0.1.3",
@@ -33,7 +34,7 @@
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.7.0",
     "react-resize-detector": "^4.2.1",
-    "react-scripts": "^3.2.0",
+    "react-scripts": "^3.4.0",
     "react-test-renderer": "^16.9.0",
     "reactstrap": "^8.0.1",
     "sanitize-html": "^1.20.1",
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
index 1793b4a5c3f0..0d8652982cd3 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
@@ -2,771 +2,811 @@
   offline_cache = linkFarm "offline" packages;
   packages = [
     {
-      name = "_babel_code_frame___code_frame_7.5.5.tgz";
+      name = "_babel_code_frame___code_frame_7.8.3.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_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_core___core_7.6.0.tgz";
+      name = "_babel_compat_data___compat_data_7.8.5.tgz";
       path = fetchurl {
-        name = "_babel_core___core_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz";
-        sha1 = "9b00f73554edd67bebc86df8303ef678be3d7b48";
+        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_core___core_7.6.4.tgz";
+      name = "_babel_core___core_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_core___core_7.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz";
-        sha1 = "6ebd9fe00925f6c3e177bb726a188b5f578088ff";
+        name = "_babel_core___core_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz";
+        sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e";
       };
     }
     {
-      name = "_babel_generator___generator_7.6.4.tgz";
+      name = "_babel_generator___generator_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz";
-        sha1 = "a4f8437287bf9671b07f483b76e3bb731bc97671";
+        name = "_babel_generator___generator_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz";
+        sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e";
       };
     }
     {
-      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.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_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_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
+      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.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_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_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
+      name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz";
-        sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4";
+        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz";
+        sha1 = "dee98d7d79cc1f003d80b76fe01c7f8945665ff6";
       };
     }
     {
-      name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
+      name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.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_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_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz";
+      name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz";
-        sha1 = "769711acca889be371e9bc2eb68641d55218021f";
+        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_define_map___helper_define_map_7.5.5.tgz";
+      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.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_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_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
+      name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.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_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_function_name___helper_function_name_7.1.0.tgz";
+      name = "_babel_helper_define_map___helper_define_map_7.8.3.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_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_get_function_arity___helper_get_function_arity_7.0.0.tgz";
+      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.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_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_hoist_variables___helper_hoist_variables_7.4.4.tgz";
+      name = "_babel_helper_function_name___helper_function_name_7.8.3.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_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_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
+      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.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_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_module_imports___helper_module_imports_7.0.0.tgz";
+      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.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_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_module_transforms___helper_module_transforms_7.5.5.tgz";
+      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.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_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_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
+      name = "_babel_helper_module_imports___helper_module_imports_7.8.3.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_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_plugin_utils___helper_plugin_utils_7.0.0.tgz";
+      name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.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_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_regex___helper_regex_7.5.5.tgz";
+      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.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_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_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
+      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.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_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_replace_supers___helper_replace_supers_7.5.5.tgz";
+      name = "_babel_helper_regex___helper_regex_7.8.3.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_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_simple_access___helper_simple_access_7.1.0.tgz";
+      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.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_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_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
+      name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.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_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_wrap_function___helper_wrap_function_7.2.0.tgz";
+      name = "_babel_helper_simple_access___helper_simple_access_7.8.3.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_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_helpers___helpers_7.6.2.tgz";
+      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_helpers___helpers_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz";
-        sha1 = "681ffe489ea4dcc55f23ce469e58e59c1c045153";
+        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_highlight___highlight_7.5.0.tgz";
+      name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.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_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_parser___parser_7.6.4.tgz";
+      name = "_babel_helpers___helpers_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_parser___parser_7.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz";
-        sha1 = "cb9b36a7482110282d5cb6dd424ec9262b473d81";
+        name = "_babel_helpers___helpers_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz";
+        sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73";
       };
     }
     {
-      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
+      name = "_babel_highlight___highlight_7.8.3.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_highlight___highlight_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz";
+        sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797";
       };
     }
     {
-      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
+      name = "_babel_parser___parser_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz";
-        sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4";
+        name = "_babel_parser___parser_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz";
+        sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8";
       };
     }
     {
-      name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.6.0.tgz";
+      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz";
-        sha1 = "6659d2572a17d70abd68123e89a12a43d90aa30c";
+        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_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
+      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.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_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_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
+      name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.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_decorators___plugin_proposal_decorators_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz";
+        sha1 = "2156860ab65c5abf068c3f67042184041066543e";
       };
     }
     {
-      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
+      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.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_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_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz";
+      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz";
-        sha1 = "8ffccc8f3a6545e9f78988b6bf4fe881b88e8096";
+        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_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
+      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.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_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_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz";
+      name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz";
-        sha1 = "05413762894f41bfe42b9a5e80919bd575dcc802";
+        name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz";
+        sha1 = "5d6769409699ec9b3b68684cd8116cedff93bad8";
       };
     }
     {
-      name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
+      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.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_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_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
+      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz";
-        sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b";
+        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_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
+      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.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_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_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
+      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
-        sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c";
+        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_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
+      name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.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_async_generators___plugin_syntax_async_generators_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz";
+        sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d";
       };
     }
     {
-      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
+      name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
-        sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7";
+        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_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
+      name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.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_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz";
+        sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3";
       };
     }
     {
-      name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
+      name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.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_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_typescript___plugin_syntax_typescript_7.3.3.tgz";
+      name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz";
-        sha1 = "a7cc3f66119a9f7ebe2de5383cce193473d65991";
+        name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz";
+        sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a";
       };
     }
     {
-      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
+      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.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_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_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
+      name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.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_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz";
+        sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9";
       };
     }
     {
-      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
+      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.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_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_transform_block_scoping___plugin_transform_block_scoping_7.6.3.tgz";
+      name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz";
-        sha1 = "6e854e51fbbaa84351b15d4ddafe342f3a5d542a";
+        name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
+        sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871";
       };
     }
     {
-      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
+      name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.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_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz";
+        sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1";
       };
     }
     {
-      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
+      name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.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_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz";
+        sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a";
       };
     }
     {
-      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz";
+      name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz";
-        sha1 = "44bbe08b57f4480094d57d9ffbcd96d309075ba6";
+        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_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz";
+      name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz";
-        sha1 = "44abb948b88f0199a627024e1508acaf8dc9b2f9";
+        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_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
+      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.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_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_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
+      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.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_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_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
+      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz";
-        sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7";
+        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_for_of___plugin_transform_for_of_7.4.4.tgz";
+      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.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_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_function_name___plugin_transform_function_name_7.4.4.tgz";
+      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.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_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_literals___plugin_transform_literals_7.2.0.tgz";
+      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.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_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_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
+      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.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_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_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
+      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.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_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_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz";
+      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz";
-        sha1 = "39dfe957de4420445f1fcf88b68a2e4aa4515486";
+        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_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
+      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.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_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_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
+      name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.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_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz";
+        sha1 = "da705a655466b2a9b36046b57bf0cbcd53551bd4";
       };
     }
     {
-      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.3.tgz";
+      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz";
-        sha1 = "aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf";
+        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_new_target___plugin_transform_new_target_7.4.4.tgz";
+      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.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_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_object_super___plugin_transform_object_super_7.5.5.tgz";
+      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.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_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_parameters___plugin_transform_parameters_7.4.4.tgz";
+      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.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_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_property_literals___plugin_transform_property_literals_7.2.0.tgz";
+      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.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_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_react_constant_elements___plugin_transform_react_constant_elements_7.6.3.tgz";
+      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.6.3.tgz";
-        sha1 = "9fc9ea060b983c7c035acbe481cbe1fb1245bfff";
+        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_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
+      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz";
-        sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0";
+        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_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
+      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz";
-        sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba";
+        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_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
+      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz";
-        sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b";
+        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_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
+      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz";
-        sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290";
+        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_regenerator___plugin_transform_regenerator_7.4.5.tgz";
+      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.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_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_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
+      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.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_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_runtime___plugin_transform_runtime_7.6.0.tgz";
+      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz";
-        sha1 = "85a3cce402b28586138e368fce20ab3019b9713e";
+        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_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
+      name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.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_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz";
+        sha1 = "784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc";
       };
     }
     {
-      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz";
+      name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz";
-        sha1 = "fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd";
+        name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz";
+        sha1 = "70ded987c91609f78353dd76d2fb2a0bb991e8e5";
       };
     }
     {
-      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
+      name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.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_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz";
+        sha1 = "c4f178b2aa588ecfa8d077ea80d4194ee77ed702";
       };
     }
     {
-      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
+      name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.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_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz";
+        sha1 = "951e75a8af47f9f120db731be095d2b2c34920e0";
       };
     }
     {
-      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
+      name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.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_react_jsx___plugin_transform_react_jsx_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz";
+        sha1 = "4220349c0390fdefa505365f68c103562ab2fc4a";
       };
     }
     {
-      name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.6.3.tgz";
+      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz";
-        sha1 = "dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b";
+        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_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz";
+      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz";
-        sha1 = "b692aad888a7e8d8b1b214be6b9dc03d5031f698";
+        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_preset_env___preset_env_7.6.0.tgz";
+      name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_preset_env___preset_env_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz";
-        sha1 = "aae4141c506100bb2bfaa4ac2a5c12b395619e50";
+        name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz";
+        sha1 = "c0153bc0a5375ebc1f1591cb7eea223adea9f169";
       };
     }
     {
-      name = "_babel_preset_env___preset_env_7.6.3.tgz";
+      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_preset_env___preset_env_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz";
-        sha1 = "9e1bf05a2e2d687036d24c40e4639dc46cef2271";
+        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_preset_react___preset_react_7.0.0.tgz";
+      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_preset_react___preset_react_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz";
-        sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0";
+        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_preset_react___preset_react_7.6.3.tgz";
+      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_preset_react___preset_react_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.6.3.tgz";
-        sha1 = "d5242c828322520205ae4eda5d4f4f618964e2f6";
+        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_preset_typescript___preset_typescript_7.6.0.tgz";
+      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_preset_typescript___preset_typescript_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz";
-        sha1 = "25768cb8830280baf47c45ab1a519a9977498c98";
+        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_runtime___runtime_7.6.0.tgz";
+      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_runtime___runtime_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz";
-        sha1 = "4fc1d642a9fd0299754e8b5de62c631cf5568205";
+        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_runtime___runtime_7.6.3.tgz";
+      name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_runtime___runtime_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz";
-        sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f";
+        name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz";
+        sha1 = "be6f01a7ef423be68e65ace1f04fc407e6d88917";
       };
     }
     {
-      name = "_babel_template___template_7.6.0.tgz";
+      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_template___template_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz";
-        sha1 = "7f0159c7f5012230dad64cca42ec9bdb5c9536e6";
+        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_traverse___traverse_7.6.3.tgz";
+      name = "_babel_preset_env___preset_env_7.8.4.tgz";
       path = fetchurl {
-        name = "_babel_traverse___traverse_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz";
-        sha1 = "66d7dba146b086703c0fb10dd588b7364cec47f9";
+        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_types___types_7.6.3.tgz";
+      name = "_babel_preset_react___preset_react_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.6.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz";
-        sha1 = "3f07d96f854f98e2fbd45c64b0cb942d11e8ba09";
+        name = "_babel_preset_react___preset_react_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz";
+        sha1 = "23dc63f1b5b0751283e04252e78cf1d6589273d2";
       };
     }
     {
-      name = "_cnakazawa_watch___watch_1.0.3.tgz";
+      name = "_babel_preset_typescript___preset_typescript_7.8.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 = "_babel_preset_typescript___preset_typescript_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz";
+        sha1 = "90af8690121beecd9a75d0cc26c6be39d1595d13";
+      };
+    }
+    {
+      name = "_babel_runtime___runtime_7.8.4.tgz";
+      path = fetchurl {
+        name = "_babel_runtime___runtime_7.8.4.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz";
+        sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308";
+      };
+    }
+    {
+      name = "_babel_template___template_7.8.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_traverse___traverse_7.8.4.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_types___types_7.8.3.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 = "_cnakazawa_watch___watch_1.0.4.tgz";
+      path = fetchurl {
+        name = "_cnakazawa_watch___watch_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a";
       };
     }
     {
@@ -778,51 +818,51 @@
       };
     }
     {
-      name = "_csstools_normalize.css___normalize.css_9.0.1.tgz";
+      name = "_csstools_normalize.css___normalize.css_10.1.0.tgz";
       path = fetchurl {
-        name = "_csstools_normalize.css___normalize.css_9.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz";
-        sha1 = "c27b391d8457d1e893f1eddeaf5e5412d12ffbb5";
+        name = "_csstools_normalize.css___normalize.css_10.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz";
+        sha1 = "f0950bba18819512d42f7197e56c518aa491cf18";
       };
     }
     {
-      name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.25.tgz";
+      name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz";
       path = fetchurl {
-        name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.25.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz";
-        sha1 = "6df015905081f2762e5cfddeb7a20d2e9b16c786";
+        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_svg_core___fontawesome_svg_core_1.2.25.tgz";
+      name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz";
       path = fetchurl {
-        name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.25.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz";
-        sha1 = "24b03391d14f0c6171e8cad7057c687b74049790";
+        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_free_solid_svg_icons___free_solid_svg_icons_5.11.2.tgz";
+      name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz";
       path = fetchurl {
-        name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.11.2.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz";
-        sha1 = "2f2f1459743a27902b76655a0d0bc5ec4d945631";
+        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_react_fontawesome___react_fontawesome_0.1.6.tgz";
+      name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz";
       path = fetchurl {
-        name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.6.tgz";
-        sha1 = "b798b96401e25d07c30bbe1b9ec0e6d8a33760a5";
+        name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz";
+        sha1 = "cb6d4dd3aeec45b6ff2d48c812317a6627618511";
       };
     }
     {
-      name = "_hapi_address___address_2.1.2.tgz";
+      name = "_hapi_address___address_2.1.4.tgz";
       path = fetchurl {
-        name = "_hapi_address___address_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz";
-        sha1 = "1c794cd6dbf2354d1eb1ef10e0303f573e1c7222";
+        name = "_hapi_address___address_2.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz";
+        sha1 = "5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5";
       };
     }
     {
@@ -834,11 +874,11 @@
       };
     }
     {
-      name = "_hapi_hoek___hoek_8.3.1.tgz";
+      name = "_hapi_hoek___hoek_8.5.1.tgz";
       path = fetchurl {
-        name = "_hapi_hoek___hoek_8.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.3.1.tgz";
-        sha1 = "227d29efdb158e4a64590224add90c820f94d20e";
+        name = "_hapi_hoek___hoek_8.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz";
+        sha1 = "fde96064ca446dec8c55a8c2f130957b070c6e06";
       };
     }
     {
@@ -954,27 +994,19 @@
       };
     }
     {
-      name = "_reach_auto_id___auto_id_0.2.0.tgz";
+      name = "_reach_router___router_1.3.1.tgz";
       path = fetchurl {
-        name = "_reach_auto_id___auto_id_0.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.2.0.tgz";
-        sha1 = "97f9e48fe736aa5c6f4f32cf73c1f19d005f8550";
+        name = "_reach_router___router_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.1.tgz";
+        sha1 = "0a49f75fa9621323d6e21c803447bcfcde1713b2";
       };
     }
     {
-      name = "_reach_router___router_1.2.1.tgz";
+      name = "_sinonjs_commons___commons_1.7.1.tgz";
       path = fetchurl {
-        name = "_reach_router___router_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/@reach/router/-/router-1.2.1.tgz";
-        sha1 = "34ae3541a5ac44fa7796e5506a5d7274a162be4e";
-      };
-    }
-    {
-      name = "_sinonjs_commons___commons_1.6.0.tgz";
-      path = fetchurl {
-        name = "_sinonjs_commons___commons_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.6.0.tgz";
-        sha1 = "ec7670432ae9c8eb710400d112c201a362d83393";
+        name = "_sinonjs_commons___commons_1.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz";
+        sha1 = "da5fd19a5f71177a53778073978873964f49acf1";
       };
     }
     {
@@ -1106,35 +1138,35 @@
       };
     }
     {
-      name = "_svgr_webpack___webpack_4.3.2.tgz";
+      name = "_svgr_webpack___webpack_4.3.3.tgz";
       path = fetchurl {
-        name = "_svgr_webpack___webpack_4.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz";
-        sha1 = "319d4471c8f3d5c3af35059274834d9b5b8fb956";
+        name = "_svgr_webpack___webpack_4.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz";
+        sha1 = "13cc2423bf3dff2d494f16b17eb7eacb86895017";
       };
     }
     {
-      name = "_testing_library_react_hooks___react_hooks_3.1.1.tgz";
+      name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz";
       path = fetchurl {
-        name = "_testing_library_react_hooks___react_hooks_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.1.1.tgz";
-        sha1 = "5c93e463c0252bea6ac237ec8d9c982c27d67208";
+        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 = "_types_babel__core___babel__core_7.1.3.tgz";
+      name = "_types_babel__core___babel__core_7.1.5.tgz";
       path = fetchurl {
-        name = "_types_babel__core___babel__core_7.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz";
-        sha1 = "e441ea7df63cd080dfcd02ab199e6d16a735fc30";
+        name = "_types_babel__core___babel__core_7.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.5.tgz";
+        sha1 = "e4d84704b4df868b3ad538365a13da2fa6dbc023";
       };
     }
     {
-      name = "_types_babel__generator___babel__generator_7.6.0.tgz";
+      name = "_types_babel__generator___babel__generator_7.6.1.tgz";
       path = fetchurl {
-        name = "_types_babel__generator___babel__generator_7.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.0.tgz";
-        sha1 = "f1ec1c104d1bb463556ecb724018ab788d0c172a";
+        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";
       };
     }
     {
@@ -1146,19 +1178,19 @@
       };
     }
     {
-      name = "_types_babel__traverse___babel__traverse_7.0.7.tgz";
+      name = "_types_babel__traverse___babel__traverse_7.0.9.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_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_cheerio___cheerio_0.22.13.tgz";
+      name = "_types_cheerio___cheerio_0.22.16.tgz";
       path = fetchurl {
-        name = "_types_cheerio___cheerio_0.22.13.tgz";
-        url  = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.13.tgz";
-        sha1 = "5eecda091a24514185dcba99eda77e62bf6523e6";
+        name = "_types_cheerio___cheerio_0.22.16.tgz";
+        url  = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.16.tgz";
+        sha1 = "c748a97b8a6f781b04bbda4a552e11b35bcc77e4";
       };
     }
     {
@@ -1178,19 +1210,19 @@
       };
     }
     {
-      name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.5.tgz";
+      name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.6.tgz";
       path = fetchurl {
-        name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.5.tgz";
-        sha1 = "1bf30a166f49be69eeda4b81e3f24113c8b4e9d5";
+        name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz";
+        sha1 = "8aca7ae2fd6c7137d869b6616e696d21bb8b0cec";
       };
     }
     {
-      name = "_types_enzyme___enzyme_3.10.3.tgz";
+      name = "_types_enzyme___enzyme_3.10.5.tgz";
       path = fetchurl {
-        name = "_types_enzyme___enzyme_3.10.3.tgz";
-        url  = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.3.tgz";
-        sha1 = "02b6c5ac7d0472005944a652e79045e2f6c66804";
+        name = "_types_enzyme___enzyme_3.10.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz";
+        sha1 = "fe7eeba3550369eed20e7fb565bfb74eec44f1f0";
       };
     }
     {
@@ -1202,6 +1234,14 @@
       };
     }
     {
+      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 {
         name = "_types_flot___flot_0.0.31.tgz";
@@ -1210,11 +1250,19 @@
       };
     }
     {
-      name = "_types_history___history_4.7.3.tgz";
+      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.5.tgz";
       path = fetchurl {
-        name = "_types_history___history_4.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz";
-        sha1 = "856c99cdc1551d22c22b18b5402719affec9839a";
+        name = "_types_history___history_4.7.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz";
+        sha1 = "527d20ef68571a4af02ed74350164e7a67544860";
       };
     }
     {
@@ -1234,11 +1282,11 @@
       };
     }
     {
-      name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz";
+      name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.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_lib_report___istanbul_lib_report_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+        sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686";
       };
     }
     {
@@ -1250,35 +1298,35 @@
       };
     }
     {
-      name = "_types_jest_diff___jest_diff_20.0.1.tgz";
+      name = "_types_jest___jest_24.9.1.tgz";
       path = fetchurl {
-        name = "_types_jest_diff___jest_diff_20.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz";
-        sha1 = "35cc15b9c4f30a18ef21852e255fdb02f6d59b89";
+        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_24.0.20.tgz";
+      name = "_types_jquery___jquery_3.3.32.tgz";
       path = fetchurl {
-        name = "_types_jest___jest_24.0.20.tgz";
-        url  = "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.20.tgz";
-        sha1 = "729d5fe8684e7fb06368d3bd557ac6d91289d861";
+        name = "_types_jquery___jquery_3.3.32.tgz";
+        url  = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.32.tgz";
+        sha1 = "93e27fdc45dd38ee07f2f0acf34b59c1ccee036f";
       };
     }
     {
-      name = "_types_jquery___jquery_3.3.31.tgz";
+      name = "_types_json_schema___json_schema_7.0.4.tgz";
       path = fetchurl {
-        name = "_types_jquery___jquery_3.3.31.tgz";
-        url  = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz";
-        sha1 = "27c706e4bf488474e1cb54a71d8303f37c93451b";
+        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.3.tgz";
+      name = "_types_minimatch___minimatch_3.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_minimatch___minimatch_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz";
+        sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d";
       };
     }
     {
@@ -1290,11 +1338,27 @@
       };
     }
     {
-      name = "_types_node___node_12.11.1.tgz";
+      name = "_types_node___node_13.7.4.tgz";
+      path = fetchurl {
+        name = "_types_node___node_13.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz";
+        sha1 = "76c3cb3a12909510f52e5dc04a6298cdf9504ffd";
+      };
+    }
+    {
+      name = "_types_node___node_12.12.28.tgz";
       path = fetchurl {
-        name = "_types_node___node_12.11.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz";
-        sha1 = "1fd7b821f798b7fa29f667a1be8f3442bb8922a3";
+        name = "_types_node___node_12.12.28.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz";
+        sha1 = "3a2b5f8d21f96ace690a8832ae9779114612575f";
+      };
+    }
+    {
+      name = "_types_parse_json___parse_json_4.0.0.tgz";
+      path = fetchurl {
+        name = "_types_parse_json___parse_json_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz";
+        sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0";
       };
     }
     {
@@ -1314,11 +1378,11 @@
       };
     }
     {
-      name = "_types_reach__router___reach__router_1.2.6.tgz";
+      name = "_types_reach__router___reach__router_1.3.0.tgz";
       path = fetchurl {
-        name = "_types_reach__router___reach__router_1.2.6.tgz";
-        url  = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.2.6.tgz";
-        sha1 = "b14cf1adbd1a365d204bbf6605cd9dd7b8816c87";
+        name = "_types_reach__router___reach__router_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.0.tgz";
+        sha1 = "4c05a947ccecca05c72bb335a0f7bb43fec12446";
       };
     }
     {
@@ -1330,43 +1394,43 @@
       };
     }
     {
-      name = "_types_react_dom___react_dom_16.9.2.tgz";
+      name = "_types_react_dom___react_dom_16.9.5.tgz";
       path = fetchurl {
-        name = "_types_react_dom___react_dom_16.9.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.2.tgz";
-        sha1 = "90f9e6c161850be1feb31d2f448121be2a4f3b47";
+        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_resize_detector___react_resize_detector_4.0.2.tgz";
+      name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz";
       path = fetchurl {
-        name = "_types_react_resize_detector___react_resize_detector_4.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.0.2.tgz";
-        sha1 = "5c046301a881fe9af741536e0dd4c34dfb155c6e";
+        name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.2.0.tgz";
+        sha1 = "ee8802e25cfb34439aa7f52626932ea62dc5792e";
       };
     }
     {
-      name = "_types_react_test_renderer___react_test_renderer_16.9.1.tgz";
+      name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz";
       path = fetchurl {
-        name = "_types_react_test_renderer___react_test_renderer_16.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.1.tgz";
-        sha1 = "9d432c46c515ebe50c45fa92c6fb5acdc22e39c4";
+        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___react_16.9.9.tgz";
+      name = "_types_react___react_16.9.21.tgz";
       path = fetchurl {
-        name = "_types_react___react_16.9.9.tgz";
-        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.9.9.tgz";
-        sha1 = "a62c6f40f04bc7681be5e20975503a64fe783c3a";
+        name = "_types_react___react_16.9.21.tgz";
+        url  = "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz";
+        sha1 = "99e274e2ecfab6bb93920e918341daa3198b348d";
       };
     }
     {
-      name = "_types_reactstrap___reactstrap_8.0.5.tgz";
+      name = "_types_reactstrap___reactstrap_8.4.1.tgz";
       path = fetchurl {
-        name = "_types_reactstrap___reactstrap_8.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.0.5.tgz";
-        sha1 = "6c6429bcfcc1d97d9a89bcb73a07bbb698bfe945";
+        name = "_types_reactstrap___reactstrap_8.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.1.tgz";
+        sha1 = "6dff4d1fdf59233877925e3caec406272050b632";
       };
     }
     {
@@ -1378,11 +1442,11 @@
       };
     }
     {
-      name = "_types_sinon___sinon_7.5.0.tgz";
+      name = "_types_sinon___sinon_7.5.1.tgz";
       path = fetchurl {
-        name = "_types_sinon___sinon_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.0.tgz";
-        sha1 = "f5a10c27175465a0b001b68d8b9f761582967cc6";
+        name = "_types_sinon___sinon_7.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz";
+        sha1 = "d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c";
       };
     }
     {
@@ -1402,91 +1466,59 @@
       };
     }
     {
-      name = "_types_testing_library__react_hooks___testing_library__react_hooks_2.0.0.tgz";
-      path = fetchurl {
-        name = "_types_testing_library__react_hooks___testing_library__react_hooks_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-2.0.0.tgz";
-        sha1 = "7b289d64945517ae8ba9cbcb0c5b282432aaeffa";
-      };
-    }
-    {
-      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_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 = "_typescript_eslint_eslint_plugin___eslint_plugin_2.5.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.5.0.tgz";
-        sha1 = "101d96743ce3365b3223df73d641078c9b775903";
-      };
-    }
-    {
-      name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.4.0.tgz";
+      name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.4.0.tgz";
-        sha1 = "aaf6b542ff75b78f4191a8bf1c519184817caa24";
+        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 = "_typescript_eslint_experimental_utils___experimental_utils_2.4.0.tgz";
+      name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_experimental_utils___experimental_utils_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.4.0.tgz";
-        sha1 = "dd8f3f466be25c3610a06fed22cfb6e6aa17f6d9";
+        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";
       };
     }
     {
-      name = "_typescript_eslint_experimental_utils___experimental_utils_2.5.0.tgz";
+      name = "_types_yargs___yargs_13.0.8.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_experimental_utils___experimental_utils_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.5.0.tgz";
-        sha1 = "383a97ded9a7940e5053449f6d73995e782b8fb1";
+        name = "_types_yargs___yargs_13.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz";
+        sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99";
       };
     }
     {
-      name = "_typescript_eslint_parser___parser_2.5.0.tgz";
+      name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_parser___parser_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.5.0.tgz";
-        sha1 = "858030ddd808fbbe88e03f42e5971efaccb8218a";
+        name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz";
+        sha1 = "a522d0e1e4898f7c9c6a8e1ed3579b60867693fa";
       };
     }
     {
-      name = "_typescript_eslint_parser___parser_2.4.0.tgz";
+      name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_parser___parser_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.4.0.tgz";
-        sha1 = "fe43ed5fec14af03d3594fce2c3b7ec4c8df0243";
+        name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz";
+        sha1 = "3b6fa5a6b8885f126d5a4280e0d44f0f41e73e32";
       };
     }
     {
-      name = "_typescript_eslint_typescript_estree___typescript_estree_2.4.0.tgz";
+      name = "_typescript_eslint_parser___parser_2.20.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_typescript_estree___typescript_estree_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.4.0.tgz";
-        sha1 = "722c95493e1b7682893edaaaec0e69f36917feef";
+        name = "_typescript_eslint_parser___parser_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.20.0.tgz";
+        sha1 = "608e5bb06ba98a415b64ace994c79ab20f9772a9";
       };
     }
     {
-      name = "_typescript_eslint_typescript_estree___typescript_estree_2.5.0.tgz";
+      name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz";
       path = fetchurl {
-        name = "_typescript_eslint_typescript_estree___typescript_estree_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.5.0.tgz";
-        sha1 = "40ada624d6217ef092a3a79ed30d947ad4f212ce";
+        name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz";
+        url  = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz";
+        sha1 = "90a0f5598826b35b966ca83483b1a621b1a4d0c9";
       };
     }
     {
@@ -1650,11 +1682,11 @@
       };
     }
     {
-      name = "abab___abab_2.0.2.tgz";
+      name = "abab___abab_2.0.3.tgz";
       path = fetchurl {
-        name = "abab___abab_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz";
-        sha1 = "a2fba1b122c69a85caa02d10f9270c7219709a9d";
+        name = "abab___abab_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
+        sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
       };
     }
     {
@@ -1706,11 +1738,11 @@
       };
     }
     {
-      name = "acorn___acorn_6.3.0.tgz";
+      name = "acorn___acorn_6.4.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.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz";
+        sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784";
       };
     }
     {
@@ -1738,6 +1770,14 @@
       };
     }
     {
+      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 = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz";
       path = fetchurl {
         name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz";
@@ -1762,11 +1802,11 @@
       };
     }
     {
-      name = "ajv___ajv_6.10.2.tgz";
+      name = "ajv___ajv_6.11.0.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.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz";
+        sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9";
       };
     }
     {
@@ -1794,11 +1834,11 @@
       };
     }
     {
-      name = "ansi_escapes___ansi_escapes_4.2.1.tgz";
+      name = "ansi_escapes___ansi_escapes_4.3.0.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_escapes___ansi_escapes_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz";
+        sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d";
       };
     }
     {
@@ -1834,6 +1874,14 @@
       };
     }
     {
+      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";
@@ -1970,11 +2018,11 @@
       };
     }
     {
-      name = "array_includes___array_includes_3.0.3.tgz";
+      name = "array_includes___array_includes_3.1.1.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_includes___array_includes_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz";
+        sha1 = "cdd67e6852bdf9c1215460786732255ed2459348";
       };
     }
     {
@@ -2010,11 +2058,11 @@
       };
     }
     {
-      name = "array.prototype.flat___array.prototype.flat_1.2.2.tgz";
+      name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
       path = fetchurl {
-        name = "array.prototype.flat___array.prototype.flat_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz";
-        sha1 = "8f3c71d245ba349b6b64b4078f76f5576f1fd723";
+        name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
+        sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
       };
     }
     {
@@ -2138,11 +2186,11 @@
       };
     }
     {
-      name = "autoprefixer___autoprefixer_9.6.5.tgz";
+      name = "autoprefixer___autoprefixer_9.7.4.tgz";
       path = fetchurl {
-        name = "autoprefixer___autoprefixer_9.6.5.tgz";
-        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.5.tgz";
-        sha1 = "98f4afe7e93cccf323287515d426019619775e5e";
+        name = "autoprefixer___autoprefixer_9.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz";
+        sha1 = "f8bf3e06707d047f0641d87aee8cfb174b2a5378";
       };
     }
     {
@@ -2154,19 +2202,19 @@
       };
     }
     {
-      name = "aws4___aws4_1.8.0.tgz";
+      name = "aws4___aws4_1.9.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.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz";
+        sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e";
       };
     }
     {
-      name = "axobject_query___axobject_query_2.0.2.tgz";
+      name = "axobject_query___axobject_query_2.1.2.tgz";
       path = fetchurl {
-        name = "axobject_query___axobject_query_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz";
-        sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9";
+        name = "axobject_query___axobject_query_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz";
+        sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799";
       };
     }
     {
@@ -2234,19 +2282,19 @@
       };
     }
     {
-      name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz";
+      name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz";
       path = fetchurl {
-        name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz";
-        sha1 = "41f7ead616fc36f6a93180e89697f69f51671181";
+        name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz";
+        sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138";
       };
     }
     {
-      name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.4.tgz";
+      name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz";
       path = fetchurl {
-        name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.4.tgz";
-        sha1 = "4a8fc30e9a3e2b1f5ed36883386ab2d84e1089bd";
+        name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz";
+        sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be";
       };
     }
     {
@@ -2282,11 +2330,11 @@
       };
     }
     {
-      name = "babel_preset_react_app___babel_preset_react_app_9.0.2.tgz";
+      name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz";
       path = fetchurl {
-        name = "babel_preset_react_app___babel_preset_react_app_9.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.2.tgz";
-        sha1 = "247d37e883d6d6f4b4691e5f23711bb2dd80567d";
+        name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz";
+        sha1 = "d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e";
       };
     }
     {
@@ -2370,11 +2418,19 @@
       };
     }
     {
-      name = "bluebird___bluebird_3.7.1.tgz";
+      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.1.tgz";
-        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz";
-        sha1 = "df70e302b471d7473489acf26a93d63b53f874de";
+        name = "bluebird___bluebird_3.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz";
+        sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f";
       };
     }
     {
@@ -2410,11 +2466,11 @@
       };
     }
     {
-      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";
       };
     }
     {
@@ -2514,27 +2570,27 @@
       };
     }
     {
-      name = "browserslist___browserslist_4.7.0.tgz";
+      name = "browserslist___browserslist_4.8.6.tgz";
       path = fetchurl {
-        name = "browserslist___browserslist_4.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz";
-        sha1 = "9ee89225ffc07db03409f2fee524dc8227458a17";
+        name = "browserslist___browserslist_4.8.6.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz";
+        sha1 = "96406f3f5f0755d272e27a66f4163ca821590a7e";
       };
     }
     {
-      name = "browserslist___browserslist_4.7.1.tgz";
+      name = "browserslist___browserslist_4.8.7.tgz";
       path = fetchurl {
-        name = "browserslist___browserslist_4.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.1.tgz";
-        sha1 = "bd400d1aea56538580e8c4d5f1c54ac11b5ab468";
+        name = "browserslist___browserslist_4.8.7.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz";
+        sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0";
       };
     }
     {
-      name = "bser___bser_2.1.0.tgz";
+      name = "bser___bser_2.1.1.tgz";
       path = fetchurl {
-        name = "bser___bser_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz";
-        sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5";
+        name = "bser___bser_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz";
+        sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05";
       };
     }
     {
@@ -2562,11 +2618,11 @@
       };
     }
     {
-      name = "buffer___buffer_4.9.1.tgz";
+      name = "buffer___buffer_4.9.2.tgz";
       path = fetchurl {
-        name = "buffer___buffer_4.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        name = "buffer___buffer_4.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz";
+        sha1 = "230ead344002988644841ab0244af8c44bbe3ef8";
       };
     }
     {
@@ -2602,6 +2658,14 @@
       };
     }
     {
+      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";
@@ -2650,11 +2714,11 @@
       };
     }
     {
-      name = "camel_case___camel_case_3.0.0.tgz";
+      name = "camel_case___camel_case_4.1.1.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 = "camel_case___camel_case_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz";
+        sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547";
       };
     }
     {
@@ -2666,14 +2730,6 @@
       };
     }
     {
-      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";
@@ -2690,11 +2746,11 @@
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30000999.tgz";
+      name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30000999.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz";
-        sha1 = "427253a69ad7bea4aa8d8345687b8eec51ca0e43";
+        name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz";
+        sha1 = "f2241242ac70e0fa9cda55c2776d32a0867971c2";
       };
     }
     {
@@ -2706,11 +2762,11 @@
       };
     }
     {
-      name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz";
+      name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz";
       path = fetchurl {
-        name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz";
-        sha1 = "3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e";
+        name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz";
+        sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7";
       };
     }
     {
@@ -2762,19 +2818,19 @@
       };
     }
     {
-      name = "chokidar___chokidar_3.2.2.tgz";
+      name = "chokidar___chokidar_3.3.1.tgz";
       path = fetchurl {
-        name = "chokidar___chokidar_3.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.2.tgz";
-        sha1 = "a433973350021e09f2b853a2287781022c0dc935";
+        name = "chokidar___chokidar_3.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz";
+        sha1 = "c84e5b3d18d9a4d77558fef466b1bf16bbeb3450";
       };
     }
     {
-      name = "chownr___chownr_1.1.3.tgz";
+      name = "chownr___chownr_1.1.4.tgz";
       path = fetchurl {
-        name = "chownr___chownr_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz";
-        sha1 = "42d837d5239688d55f303003a508230fa6727142";
+        name = "chownr___chownr_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz";
+        sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b";
       };
     }
     {
@@ -2818,19 +2874,27 @@
       };
     }
     {
-      name = "clean_css___clean_css_4.2.1.tgz";
+      name = "clean_css___clean_css_4.2.3.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_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz";
+        sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
       };
     }
     {
-      name = "cli_cursor___cli_cursor_2.1.0.tgz";
+      name = "clean_stack___clean_stack_2.2.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 = "clean_stack___clean_stack_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz";
+        sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b";
+      };
+    }
+    {
+      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";
       };
     }
     {
@@ -2954,22 +3018,6 @@
       };
     }
     {
-      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.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_2.20.3.tgz";
       path = fetchurl {
         name = "commander___commander_2.20.3.tgz";
@@ -2978,11 +3026,11 @@
       };
     }
     {
-      name = "commander___commander_2.19.0.tgz";
+      name = "commander___commander_4.1.1.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_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
+        sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
       };
     }
     {
@@ -3018,11 +3066,11 @@
       };
     }
     {
-      name = "compressible___compressible_2.0.17.tgz";
+      name = "compressible___compressible_2.0.18.tgz";
       path = fetchurl {
-        name = "compressible___compressible_2.0.17.tgz";
-        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz";
-        sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1";
+        name = "compressible___compressible_2.0.18.tgz";
+        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz";
+        sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba";
       };
     }
     {
@@ -3034,11 +3082,11 @@
       };
     }
     {
-      name = "compute_scroll_into_view___compute_scroll_into_view_1.0.11.tgz";
+      name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz";
       path = fetchurl {
-        name = "compute_scroll_into_view___compute_scroll_into_view_1.0.11.tgz";
-        url  = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.11.tgz";
-        sha1 = "7ff0a57f9aeda6314132d8994cce7aeca794fecf";
+        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";
       };
     }
     {
@@ -3074,11 +3122,11 @@
       };
     }
     {
-      name = "console_browserify___console_browserify_1.1.0.tgz";
+      name = "console_browserify___console_browserify_1.2.0.tgz";
       path = fetchurl {
-        name = "console_browserify___console_browserify_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+        name = "console_browserify___console_browserify_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336";
       };
     }
     {
@@ -3122,11 +3170,11 @@
       };
     }
     {
-      name = "convert_source_map___convert_source_map_1.6.0.tgz";
+      name = "convert_source_map___convert_source_map_1.7.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 = "convert_source_map___convert_source_map_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442";
       };
     }
     {
@@ -3170,43 +3218,35 @@
       };
     }
     {
-      name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz";
+      name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz";
       path = fetchurl {
-        name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz";
-        sha1 = "d2724a3ccbfed89706fac8a894872c979ac74467";
+        name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz";
+        sha1 = "b1a1137100e5665d5a96015cb579e30e90e07c44";
       };
     }
     {
-      name = "core_js_compat___core_js_compat_3.3.2.tgz";
+      name = "core_js_compat___core_js_compat_3.6.4.tgz";
       path = fetchurl {
-        name = "core_js_compat___core_js_compat_3.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.2.tgz";
-        sha1 = "1096c989c1b929ede06b5b6b4768dc4439078c03";
+        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___core_js_3.2.1.tgz";
+      name = "core_js___core_js_2.6.11.tgz";
       path = fetchurl {
-        name = "core_js___core_js_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz";
-        sha1 = "cd41f38534da6cc59f7db050fe67307de9868b09";
+        name = "core_js___core_js_2.6.11.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz";
+        sha1 = "38831469f9922bded8ee21c9dc46985e0399308c";
       };
     }
     {
-      name = "core_js___core_js_1.2.7.tgz";
+      name = "core_js___core_js_3.6.4.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.6.10.tgz";
-      path = fetchurl {
-        name = "core_js___core_js_2.6.10.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz";
-        sha1 = "8a5b8391f8cc7013da703411ce5b585706300d7f";
+        name = "core_js___core_js_3.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz";
+        sha1 = "440a83536b458114b9cb2ac1580ba377dc470647";
       };
     }
     {
@@ -3226,6 +3266,14 @@
       };
     }
     {
+      name = "cosmiconfig___cosmiconfig_6.0.0.tgz";
+      path = fetchurl {
+        name = "cosmiconfig___cosmiconfig_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz";
+        sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982";
+      };
+    }
+    {
       name = "create_ecdh___create_ecdh_4.0.3.tgz";
       path = fetchurl {
         name = "create_ecdh___create_ecdh_4.0.3.tgz";
@@ -3250,14 +3298,6 @@
       };
     }
     {
-      name = "create_react_context___create_react_context_0.2.3.tgz";
-      path = fetchurl {
-        name = "create_react_context___create_react_context_0.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz";
-        sha1 = "9ec140a6914a22ef04b8b09b7771de89567cb6f3";
-      };
-    }
-    {
       name = "create_react_context___create_react_context_0.3.0.tgz";
       path = fetchurl {
         name = "create_react_context___create_react_context_0.3.0.tgz";
@@ -3274,6 +3314,14 @@
       };
     }
     {
+      name = "cross_spawn___cross_spawn_7.0.1.tgz";
+      path = fetchurl {
+        name = "cross_spawn___cross_spawn_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz";
+        sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14";
+      };
+    }
+    {
       name = "cross_spawn___cross_spawn_6.0.5.tgz";
       path = fetchurl {
         name = "cross_spawn___cross_spawn_6.0.5.tgz";
@@ -3322,11 +3370,11 @@
       };
     }
     {
-      name = "css_loader___css_loader_2.1.1.tgz";
+      name = "css_loader___css_loader_3.4.2.tgz";
       path = fetchurl {
-        name = "css_loader___css_loader_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz";
-        sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea";
+        name = "css_loader___css_loader_3.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz";
+        sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202";
       };
     }
     {
@@ -3354,43 +3402,43 @@
       };
     }
     {
-      name = "css_select___css_select_2.0.2.tgz";
+      name = "css_select___css_select_2.1.0.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_select___css_select_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz";
+        sha1 = "6a34653356635934a81baca68d0255432105dbef";
       };
     }
     {
-      name = "css_tree___css_tree_1.0.0_alpha.29.tgz";
+      name = "css_tree___css_tree_1.0.0_alpha.37.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_tree___css_tree_1.0.0_alpha.37.tgz";
+        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz";
+        sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22";
       };
     }
     {
-      name = "css_tree___css_tree_1.0.0_alpha.33.tgz";
+      name = "css_what___css_what_2.1.3.tgz";
       path = fetchurl {
-        name = "css_tree___css_tree_1.0.0_alpha.33.tgz";
-        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz";
-        sha1 = "970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e";
+        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_unit_converter___css_unit_converter_1.1.1.tgz";
+      name = "css_what___css_what_3.2.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_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_2.1.3.tgz";
+      name = "css.escape___css.escape_1.5.1.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";
+        url  = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz";
+        sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb";
       };
     }
     {
@@ -3474,11 +3522,11 @@
       };
     }
     {
-      name = "csso___csso_3.5.1.tgz";
+      name = "csso___csso_4.0.2.tgz";
       path = fetchurl {
-        name = "csso___csso_3.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz";
-        sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b";
+        name = "csso___csso_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz";
+        sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d";
       };
     }
     {
@@ -3490,11 +3538,11 @@
       };
     }
     {
-      name = "cssom___cssom_0.4.1.tgz";
+      name = "cssom___cssom_0.4.4.tgz";
       path = fetchurl {
-        name = "cssom___cssom_0.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.1.tgz";
-        sha1 = "b24111d236b6dbd00cdfacb5ab67a20473381fe3";
+        name = "cssom___cssom_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz";
+        sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10";
       };
     }
     {
@@ -3506,19 +3554,19 @@
       };
     }
     {
-      name = "cssstyle___cssstyle_2.0.0.tgz";
+      name = "cssstyle___cssstyle_2.2.0.tgz";
       path = fetchurl {
-        name = "cssstyle___cssstyle_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.0.0.tgz";
-        sha1 = "911f0fe25532db4f5d44afc83f89cc4b82c97fe3";
+        name = "cssstyle___cssstyle_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz";
+        sha1 = "e4c44debccd6b7911ed617a4395e5754bba59992";
       };
     }
     {
-      name = "csstype___csstype_2.6.7.tgz";
+      name = "csstype___csstype_2.6.9.tgz";
       path = fetchurl {
-        name = "csstype___csstype_2.6.7.tgz";
-        url  = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz";
-        sha1 = "20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5";
+        name = "csstype___csstype_2.6.9.tgz";
+        url  = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz";
+        sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098";
       };
     }
     {
@@ -3538,11 +3586,11 @@
       };
     }
     {
-      name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz";
+      name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz";
       path = fetchurl {
-        name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz";
-        sha1 = "780cf7144eb2e8dbd1c3bb83ae31100ccc31a414";
+        name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz";
+        sha1 = "143c1641cb3d85c60c32329e26899adea8701791";
       };
     }
     {
@@ -3562,14 +3610,6 @@
       };
     }
     {
-      name = "date_now___date_now_0.1.4.tgz";
-      path = fetchurl {
-        name = "date_now___date_now_0.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    }
-    {
       name = "debug___debug_2.6.9.tgz";
       path = fetchurl {
         name = "debug___debug_2.6.9.tgz";
@@ -3602,14 +3642,6 @@
       };
     }
     {
-      name = "decamelize___decamelize_2.0.0.tgz";
-      path = fetchurl {
-        name = "decamelize___decamelize_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz";
-        sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7";
-      };
-    }
-    {
       name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
       path = fetchurl {
         name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
@@ -3618,11 +3650,11 @@
       };
     }
     {
-      name = "deep_equal___deep_equal_1.1.0.tgz";
+      name = "deep_equal___deep_equal_1.1.1.tgz";
       path = fetchurl {
-        name = "deep_equal___deep_equal_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz";
-        sha1 = "3103cdf8ab6d32cf4a8df7865458f2b8d33f3745";
+        name = "deep_equal___deep_equal_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz";
+        sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a";
       };
     }
     {
@@ -3682,11 +3714,11 @@
       };
     }
     {
-      name = "del___del_3.0.0.tgz";
+      name = "del___del_4.1.1.tgz";
       path = fetchurl {
-        name = "del___del_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz";
-        sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5";
+        name = "del___del_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz";
+        sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4";
       };
     }
     {
@@ -3714,11 +3746,11 @@
       };
     }
     {
-      name = "des.js___des.js_1.0.0.tgz";
+      name = "des.js___des.js_1.0.1.tgz";
       path = fetchurl {
-        name = "des.js___des.js_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+        name = "des.js___des.js_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz";
+        sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843";
       };
     }
     {
@@ -3866,11 +3898,11 @@
       };
     }
     {
-      name = "dom_serializer___dom_serializer_0.2.1.tgz";
+      name = "dom_serializer___dom_serializer_0.2.2.tgz";
       path = fetchurl {
-        name = "dom_serializer___dom_serializer_0.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz";
-        sha1 = "13650c850daffea35d8b626a4cfc4d3a17643fdb";
+        name = "dom_serializer___dom_serializer_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz";
+        sha1 = "1afb81f533717175d478655debc5e332d9f9bb51";
       };
     }
     {
@@ -3938,11 +3970,19 @@
       };
     }
     {
-      name = "dot_prop___dot_prop_4.2.0.tgz";
+      name = "dot_case___dot_case_3.0.3.tgz";
+      path = fetchurl {
+        name = "dot_case___dot_case_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz";
+        sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa";
+      };
+    }
+    {
+      name = "dot_prop___dot_prop_5.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 = "dot_prop___dot_prop_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz";
+        sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb";
       };
     }
     {
@@ -3954,19 +3994,19 @@
       };
     }
     {
-      name = "dotenv___dotenv_6.2.0.tgz";
+      name = "dotenv___dotenv_8.2.0.tgz";
       path = fetchurl {
-        name = "dotenv___dotenv_6.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz";
-        sha1 = "941c0410535d942c8becf28d3f357dbd9d476064";
+        name = "dotenv___dotenv_8.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz";
+        sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a";
       };
     }
     {
-      name = "downshift___downshift_3.3.5.tgz";
+      name = "downshift___downshift_3.4.8.tgz";
       path = fetchurl {
-        name = "downshift___downshift_3.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/downshift/-/downshift-3.3.5.tgz";
-        sha1 = "635f465ab45f577814a98901024873637649ce6f";
+        name = "downshift___downshift_3.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/downshift/-/downshift-3.4.8.tgz";
+        sha1 = "06b7ad9e9c423a58e8a9049b2a00a5d19c7ef954";
       };
     }
     {
@@ -4002,19 +4042,19 @@
       };
     }
     {
-      name = "electron_to_chromium___electron_to_chromium_1.3.284.tgz";
+      name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz";
       path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.3.284.tgz";
-        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.284.tgz";
-        sha1 = "b24359fa4f49b3a7c52afc005d59ec3aa9f6796e";
+        name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.356.tgz";
+        sha1 = "fb985ee0f3023e6e11b97547ff3f738bdd8643d2";
       };
     }
     {
-      name = "elliptic___elliptic_6.5.1.tgz";
+      name = "elliptic___elliptic_6.5.2.tgz";
       path = fetchurl {
-        name = "elliptic___elliptic_6.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz";
-        sha1 = "c380f5f909bf1b9b4428d028cd18d3b0efd6b52b";
+        name = "elliptic___elliptic_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz";
+        sha1 = "05c5678d7173c049d8ca433552224a495d0e3762";
       };
     }
     {
@@ -4026,6 +4066,14 @@
       };
     }
     {
+      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";
@@ -4034,19 +4082,19 @@
       };
     }
     {
-      name = "encodeurl___encodeurl_1.0.2.tgz";
+      name = "emojis_list___emojis_list_3.0.0.tgz";
       path = fetchurl {
-        name = "encodeurl___encodeurl_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
-        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+        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 = "encoding___encoding_0.1.12.tgz";
+      name = "encodeurl___encodeurl_1.0.2.tgz";
       path = fetchurl {
-        name = "encoding___encoding_0.1.12.tgz";
-        url  = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz";
-        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
+        name = "encodeurl___encodeurl_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     }
     {
@@ -4082,43 +4130,43 @@
       };
     }
     {
-      name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.1.tgz";
+      name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz";
       path = fetchurl {
-        name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.1.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.1.tgz";
-        sha1 = "8ad55332be7091dc53a25d7d38b3485fc2ba50d5";
+        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_utils___enzyme_adapter_utils_1.12.1.tgz";
+      name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz";
       path = fetchurl {
-        name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.1.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.1.tgz";
-        sha1 = "e828e0d038e2b1efa4b9619ce896226f85c9dd88";
+        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_shallow_equal___enzyme_shallow_equal_1.0.0.tgz";
+      name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz";
       path = fetchurl {
-        name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.0.tgz";
-        sha1 = "d8e4603495e6ea279038eef05a4bf4887b55dc69";
+        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_to_json___enzyme_to_json_3.4.3.tgz";
+      name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz";
       path = fetchurl {
-        name = "enzyme_to_json___enzyme_to_json_3.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.4.3.tgz";
-        sha1 = "ed4386f48768ed29e2d1a2910893542c34e7e0af";
+        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___enzyme_3.10.0.tgz";
+      name = "enzyme___enzyme_3.11.0.tgz";
       path = fetchurl {
-        name = "enzyme___enzyme_3.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.10.0.tgz";
-        sha1 = "7218e347c4a7746e133f8e964aada4a3523452f6";
+        name = "enzyme___enzyme_3.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz";
+        sha1 = "71d680c580fe9349f6f5ac6c775bc3e6b7a79c28";
       };
     }
     {
@@ -4138,35 +4186,27 @@
       };
     }
     {
-      name = "es_abstract___es_abstract_1.15.0.tgz";
+      name = "es_abstract___es_abstract_1.17.4.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.15.0.tgz";
-        sha1 = "8884928ec7e40a79e3c9bc812d37d10c8b24cc57";
+        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.16.0.tgz";
+      name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz";
-        sha1 = "d3a26dc9c3283ac9750dca569586e976d9dcc06d";
+        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 = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+      name = "es5_ext___es5_ext_0.10.53.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 = "es5_ext___es5_ext_0.10.51.tgz";
-      path = fetchurl {
-        name = "es5_ext___es5_ext_0.10.51.tgz";
-        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.51.tgz";
-        sha1 = "ed2d7d9d48a12df86e0299287e93a09ff478842f";
+        name = "es5_ext___es5_ext_0.10.53.tgz";
+        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1";
       };
     }
     {
@@ -4178,11 +4218,11 @@
       };
     }
     {
-      name = "es6_symbol___es6_symbol_3.1.2.tgz";
+      name = "es6_symbol___es6_symbol_3.1.3.tgz";
       path = fetchurl {
-        name = "es6_symbol___es6_symbol_3.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.2.tgz";
-        sha1 = "859fdd34f32e905ff06d752e7171ddd4444a7ed1";
+        name = "es6_symbol___es6_symbol_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18";
       };
     }
     {
@@ -4194,6 +4234,14 @@
       };
     }
     {
+      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 = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
       path = fetchurl {
         name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
@@ -4202,51 +4250,51 @@
       };
     }
     {
-      name = "escodegen___escodegen_1.12.0.tgz";
+      name = "escodegen___escodegen_1.14.1.tgz";
       path = fetchurl {
-        name = "escodegen___escodegen_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz";
-        sha1 = "f763daf840af172bb3a2b6dd7219c0e17f7ff541";
+        name = "escodegen___escodegen_1.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz";
+        sha1 = "ba01d0c8278b5e95a9a45350142026659027a457";
       };
     }
     {
-      name = "eslint_config_prettier___eslint_config_prettier_6.4.0.tgz";
+      name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz";
       path = fetchurl {
-        name = "eslint_config_prettier___eslint_config_prettier_6.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz";
-        sha1 = "0a04f147e31d33c6c161b2dd0971418ac52d0477";
+        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_react_app___eslint_config_react_app_5.0.2.tgz";
+      name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz";
       path = fetchurl {
-        name = "eslint_config_react_app___eslint_config_react_app_5.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.2.tgz";
-        sha1 = "df40d73a1402986030680c040bbee520db5a32a4";
+        name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz";
+        sha1 = "135110ba56a9e378f7acfe5f36e2ae76a2317899";
       };
     }
     {
-      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
+      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz";
-        sha1 = "58f15fb839b8d0576ca980413476aab2472db66a";
+        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_loader___eslint_loader_3.0.2.tgz";
+      name = "eslint_loader___eslint_loader_3.0.3.tgz";
       path = fetchurl {
-        name = "eslint_loader___eslint_loader_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.2.tgz";
-        sha1 = "5a627316a51d6f41d357b9f6f0554e91506cdd6e";
+        name = "eslint_loader___eslint_loader_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz";
+        sha1 = "e018e3d2722381d982b1201adb56819c73b480ca";
       };
     }
     {
-      name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
+      name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
       path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz";
-        sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c";
+        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";
       };
     }
     {
@@ -4258,11 +4306,27 @@
       };
     }
     {
-      name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
+      name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz";
-        sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6";
+        name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz";
+        sha1 = "82b2bd6f21770e0e5deede0228e456cb35308451";
+      };
+    }
+    {
+      name = "eslint_plugin_import___eslint_plugin_import_2.20.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_import___eslint_plugin_import_2.20.1.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz";
+        sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
       };
     }
     {
@@ -4274,11 +4338,11 @@
       };
     }
     {
-      name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.1.tgz";
+      name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz";
       path = fetchurl {
-        name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz";
-        sha1 = "507b8562410d02a03f0ddc949c616f877852f2ba";
+        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";
       };
     }
     {
@@ -4290,19 +4354,19 @@
       };
     }
     {
-      name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz";
+      name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz";
-        sha1 = "911030dd7e98ba49e1b2208599571846a66bdf13";
+        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.16.0.tgz";
+      name = "eslint_plugin_react___eslint_plugin_react_7.18.3.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_plugin_react___eslint_plugin_react_7.18.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz";
+        sha1 = "8be671b7f6be095098e79d27ac32f9580f599bc8";
       };
     }
     {
@@ -4322,11 +4386,11 @@
       };
     }
     {
-      name = "eslint_utils___eslint_utils_1.4.2.tgz";
+      name = "eslint_utils___eslint_utils_1.4.3.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";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
+        sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
       };
     }
     {
@@ -4338,27 +4402,19 @@
       };
     }
     {
-      name = "eslint___eslint_6.5.1.tgz";
-      path = fetchurl {
-        name = "eslint___eslint_6.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz";
-        sha1 = "828e4c469697d43bb586144be152198b91e96ed6";
-      };
-    }
-    {
-      name = "espree___espree_6.1.1.tgz";
+      name = "eslint___eslint_6.8.0.tgz";
       path = fetchurl {
-        name = "espree___espree_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz";
-        sha1 = "7f80e5f7257fc47db450022d723e356daeb1e5de";
+        name = "eslint___eslint_6.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz";
+        sha1 = "62262d6729739f9275723824302fb227c8c93ffb";
       };
     }
     {
-      name = "esprima___esprima_3.1.3.tgz";
+      name = "espree___espree_6.1.2.tgz";
       path = fetchurl {
-        name = "esprima___esprima_3.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        name = "espree___espree_6.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz";
+        sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d";
       };
     }
     {
@@ -4370,11 +4426,11 @@
       };
     }
     {
-      name = "esquery___esquery_1.0.1.tgz";
+      name = "esquery___esquery_1.1.0.tgz";
       path = fetchurl {
-        name = "esquery___esquery_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
-        sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
+        name = "esquery___esquery_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz";
+        sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48";
       };
     }
     {
@@ -4418,11 +4474,11 @@
       };
     }
     {
-      name = "events___events_3.0.0.tgz";
+      name = "events___events_3.1.0.tgz";
       path = fetchurl {
-        name = "events___events_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz";
-        sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88";
+        name = "events___events_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz";
+        sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59";
       };
     }
     {
@@ -4442,11 +4498,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";
       };
     }
     {
@@ -4490,6 +4546,14 @@
       };
     }
     {
+      name = "ext___ext_1.4.0.tgz";
+      path = fetchurl {
+        name = "ext___ext_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz";
+        sha1 = "89ae7a07158f79d35517882904324077e4379244";
+      };
+    }
+    {
       name = "extend_shallow___extend_shallow_2.0.1.tgz";
       path = fetchurl {
         name = "extend_shallow___extend_shallow_2.0.1.tgz";
@@ -4546,11 +4610,11 @@
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.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";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
       };
     }
     {
@@ -4570,11 +4634,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";
       };
     }
     {
@@ -4602,19 +4666,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 = "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 = "fb_watchman___fb_watchman_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz";
+        sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85";
       };
     }
     {
@@ -4626,11 +4682,11 @@
       };
     }
     {
-      name = "figures___figures_2.0.0.tgz";
+      name = "figures___figures_3.2.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.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz";
+        sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af";
       };
     }
     {
@@ -4642,19 +4698,27 @@
       };
     }
     {
-      name = "file_loader___file_loader_3.0.1.tgz";
+      name = "file_loader___file_loader_4.3.0.tgz";
+      path = fetchurl {
+        name = "file_loader___file_loader_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz";
+        sha1 = "780f040f729b3d18019f20605f723e844b8a58af";
+      };
+    }
+    {
+      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
       path = fetchurl {
-        name = "file_loader___file_loader_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz";
-        sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa";
+        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";
+      name = "filesize___filesize_6.0.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 = "filesize___filesize_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz";
+        sha1 = "f850b509909c7c86f7e450ea19006c31c2ed3d2f";
       };
     }
     {
@@ -4698,11 +4762,19 @@
       };
     }
     {
-      name = "find_up___find_up_3.0.0.tgz";
+      name = "find_cache_dir___find_cache_dir_3.2.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_cache_dir___find_cache_dir_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz";
+        sha1 = "e7fe44c1abc1299f516146e563108fd1006c1874";
+      };
+    }
+    {
+      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";
       };
     }
     {
@@ -4722,6 +4794,14 @@
       };
     }
     {
+      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 = "flat_cache___flat_cache_2.0.1.tgz";
       path = fetchurl {
         name = "flat_cache___flat_cache_2.0.1.tgz";
@@ -4738,19 +4818,11 @@
       };
     }
     {
-      name = "flatten___flatten_1.0.2.tgz";
-      path = fetchurl {
-        name = "flatten___flatten_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz";
-        sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
-      };
-    }
-    {
-      name = "flot___flot_3.2.13.tgz";
+      name = "flatten___flatten_1.0.3.tgz";
       path = fetchurl {
-        name = "flot___flot_3.2.13.tgz";
-        url  = "https://registry.yarnpkg.com/flot/-/flot-3.2.13.tgz";
-        sha1 = "f4457fd6042fe4ac4e4e124e7a7c7256e69f5362";
+        name = "flatten___flatten_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz";
+        sha1 = "c1283ac9f27b368abc1e36d1ff7b04501a30356b";
       };
     }
     {
@@ -4762,11 +4834,11 @@
       };
     }
     {
-      name = "follow_redirects___follow_redirects_1.9.0.tgz";
+      name = "follow_redirects___follow_redirects_1.10.0.tgz";
       path = fetchurl {
-        name = "follow_redirects___follow_redirects_1.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz";
-        sha1 = "8d5bcdc65b7108fe1508649c79c12d732dcedb4f";
+        name = "follow_redirects___follow_redirects_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz";
+        sha1 = "01f5263aee921c6a54fb91667f08f4155ce169eb";
       };
     }
     {
@@ -4802,11 +4874,11 @@
       };
     }
     {
-      name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz";
+      name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz";
       path = fetchurl {
-        name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz";
-        sha1 = "ce1d77190b44d81a761b10b6284a373795e41f0c";
+        name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz";
+        sha1 = "a1642c0d3e65f50c2cc1742e9c0a80f441f86b19";
       };
     }
     {
@@ -4850,14 +4922,6 @@
       };
     }
     {
-      name = "fs_extra___fs_extra_7.0.1.tgz";
-      path = fetchurl {
-        name = "fs_extra___fs_extra_7.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz";
-        sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9";
-      };
-    }
-    {
       name = "fs_extra___fs_extra_4.0.3.tgz";
       path = fetchurl {
         name = "fs_extra___fs_extra_4.0.3.tgz";
@@ -4866,6 +4930,14 @@
       };
     }
     {
+      name = "fs_extra___fs_extra_7.0.1.tgz";
+      path = fetchurl {
+        name = "fs_extra___fs_extra_7.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz";
+        sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9";
+      };
+    }
+    {
       name = "fs_extra___fs_extra_8.1.0.tgz";
       path = fetchurl {
         name = "fs_extra___fs_extra_8.1.0.tgz";
@@ -4882,6 +4954,14 @@
       };
     }
     {
+      name = "fs_minipass___fs_minipass_2.1.0.tgz";
+      path = fetchurl {
+        name = "fs_minipass___fs_minipass_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz";
+        sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb";
+      };
+    }
+    {
       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";
@@ -4898,27 +4978,19 @@
       };
     }
     {
-      name = "fsevents___fsevents_2.0.7.tgz";
+      name = "fsevents___fsevents_2.1.2.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.2.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz";
+        sha1 = "4c0a1fb34bc68e543b4b82a9ec392bfbda840805";
       };
     }
     {
-      name = "fsevents___fsevents_1.2.9.tgz";
+      name = "fsevents___fsevents_1.2.11.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_2.1.1.tgz";
-      path = fetchurl {
-        name = "fsevents___fsevents_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz";
-        sha1 = "74c64e21df71721845d0c44fe54b7f56b82995a9";
+        name = "fsevents___fsevents_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz";
+        sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3";
       };
     }
     {
@@ -4930,11 +5002,11 @@
       };
     }
     {
-      name = "function.prototype.name___function.prototype.name_1.1.1.tgz";
+      name = "function.prototype.name___function.prototype.name_1.1.2.tgz";
       path = fetchurl {
-        name = "function.prototype.name___function.prototype.name_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz";
-        sha1 = "6d252350803085abc2ad423d4fe3be2f9cbda392";
+        name = "function.prototype.name___function.prototype.name_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz";
+        sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45";
       };
     }
     {
@@ -4946,11 +5018,11 @@
       };
     }
     {
-      name = "functions_have_names___functions_have_names_1.2.0.tgz";
+      name = "functions_have_names___functions_have_names_1.2.1.tgz";
       path = fetchurl {
-        name = "functions_have_names___functions_have_names_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz";
-        sha1 = "83da7583e4ea0c9ac5ff530f73394b033e0bf77d";
+        name = "functions_have_names___functions_have_names_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz";
+        sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91";
       };
     }
     {
@@ -4970,6 +5042,14 @@
       };
     }
     {
+      name = "gensync___gensync_1.0.0_beta.1.tgz";
+      path = fetchurl {
+        name = "gensync___gensync_1.0.0_beta.1.tgz";
+        url  = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz";
+        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";
@@ -4986,11 +5066,11 @@
       };
     }
     {
-      name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.1.tgz";
+      name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz";
       path = fetchurl {
-        name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz";
-        sha1 = "6f7764f88ea11e0b514bd9bd860a132259992ca4";
+        name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz";
+        sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664";
       };
     }
     {
@@ -5050,11 +5130,11 @@
       };
     }
     {
-      name = "glob___glob_7.1.4.tgz";
+      name = "glob___glob_7.1.6.tgz";
       path = fetchurl {
-        name = "glob___glob_7.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz";
-        sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255";
+        name = "glob___glob_7.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
+        sha1 = "141f33b81a7c2492e125594307480c46679278a6";
       };
     }
     {
@@ -5082,6 +5162,14 @@
       };
     }
     {
+      name = "globals___globals_12.3.0.tgz";
+      path = fetchurl {
+        name = "globals___globals_12.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz";
+        sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13";
+      };
+    }
+    {
       name = "globby___globby_8.0.2.tgz";
       path = fetchurl {
         name = "globby___globby_8.0.2.tgz";
@@ -5098,11 +5186,11 @@
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.2.tgz";
+      name = "graceful_fs___graceful_fs_4.2.3.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz";
-        sha1 = "6f0952605d0140c1cfdb138ed005775b92d67b02";
+        name = "graceful_fs___graceful_fs_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
       };
     }
     {
@@ -5138,14 +5226,6 @@
       };
     }
     {
-      name = "handlebars___handlebars_4.4.3.tgz";
-      path = fetchurl {
-        name = "handlebars___handlebars_4.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.3.tgz";
-        sha1 = "180bae52c1d0e9ec0c15d7e82a4362d662762f6e";
-      };
-    }
-    {
       name = "har_schema___har_schema_2.0.0.tgz";
       path = fetchurl {
         name = "har_schema___har_schema_2.0.0.tgz";
@@ -5186,11 +5266,19 @@
       };
     }
     {
-      name = "has_symbols___has_symbols_1.0.0.tgz";
+      name = "has_flag___has_flag_4.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_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.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";
       };
     }
     {
@@ -5322,11 +5410,11 @@
       };
     }
     {
-      name = "html_element_map___html_element_map_1.1.0.tgz";
+      name = "html_element_map___html_element_map_1.2.0.tgz";
       path = fetchurl {
-        name = "html_element_map___html_element_map_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.1.0.tgz";
-        sha1 = "e5aab9a834caf883b421f8bd9eaedcaac887d63c";
+        name = "html_element_map___html_element_map_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz";
+        sha1 = "dfbb09efe882806af63d990cf6db37993f099f22";
       };
     }
     {
@@ -5346,19 +5434,27 @@
       };
     }
     {
-      name = "html_minifier___html_minifier_3.5.21.tgz";
+      name = "html_escaper___html_escaper_2.0.0.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_escaper___html_escaper_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz";
+        sha1 = "71e87f931de3fe09e56661ab9a29aadec707b491";
       };
     }
     {
-      name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz";
+      name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz";
       path = fetchurl {
-        name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz";
-        url  = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz";
-        sha1 = "2c53083c1151bfec20479b1f8aaf0039e77b5513";
+        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_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
+      path = fetchurl {
+        name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
+        url  = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz";
+        sha1 = "3059a69144b5aecef97708196ca32f9e68677715";
       };
     }
     {
@@ -5458,14 +5554,6 @@
       };
     }
     {
-      name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
-      path = fetchurl {
-        name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz";
-        sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded";
-      };
-    }
-    {
       name = "icss_utils___icss_utils_4.1.1.tgz";
       path = fetchurl {
         name = "icss_utils___icss_utils_4.1.1.tgz";
@@ -5546,11 +5634,11 @@
       };
     }
     {
-      name = "import_fresh___import_fresh_3.1.0.tgz";
+      name = "import_fresh___import_fresh_3.2.1.tgz";
       path = fetchurl {
-        name = "import_fresh___import_fresh_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz";
-        sha1 = "6d33fa1dcef6df930fae003446f33415af905118";
+        name = "import_fresh___import_fresh_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
+        sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
       };
     }
     {
@@ -5578,6 +5666,14 @@
       };
     }
     {
+      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";
@@ -5634,19 +5730,11 @@
       };
     }
     {
-      name = "inquirer___inquirer_6.5.0.tgz";
+      name = "inquirer___inquirer_7.0.4.tgz";
       path = fetchurl {
-        name = "inquirer___inquirer_6.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz";
-        sha1 = "2303317efc9a4ea7ec2e2df6f86569b734accf42";
-      };
-    }
-    {
-      name = "inquirer___inquirer_6.5.2.tgz";
-      path = fetchurl {
-        name = "inquirer___inquirer_6.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz";
-        sha1 = "ad50942375d036d327ff528c08bd5fab089928ca";
+        name = "inquirer___inquirer_7.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz";
+        sha1 = "99af5bde47153abca23f5c7fc30db247f39da703";
       };
     }
     {
@@ -5658,6 +5746,14 @@
       };
     }
     {
+      name = "internal_slot___internal_slot_1.0.2.tgz";
+      path = fetchurl {
+        name = "internal_slot___internal_slot_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz";
+        sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3";
+      };
+    }
+    {
       name = "invariant___invariant_2.2.4.tgz";
       path = fetchurl {
         name = "invariant___invariant_2.2.4.tgz";
@@ -5714,6 +5810,14 @@
       };
     }
     {
+      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";
@@ -5770,11 +5874,11 @@
       };
     }
     {
-      name = "is_boolean_object___is_boolean_object_1.0.0.tgz";
+      name = "is_boolean_object___is_boolean_object_1.0.1.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_boolean_object___is_boolean_object_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz";
+        sha1 = "10edc0900dd127697a92f6f9807c7617d68ac48e";
       };
     }
     {
@@ -5786,11 +5890,11 @@
       };
     }
     {
-      name = "is_callable___is_callable_1.1.4.tgz";
+      name = "is_callable___is_callable_1.1.5.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";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
+        sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
       };
     }
     {
@@ -5826,11 +5930,11 @@
       };
     }
     {
-      name = "is_date_object___is_date_object_1.0.1.tgz";
+      name = "is_date_object___is_date_object_1.0.2.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_date_object___is_date_object_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e";
       };
     }
     {
@@ -5858,6 +5962,14 @@
       };
     }
     {
+      name = "is_docker___is_docker_2.0.0.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_extendable___is_extendable_0.1.1.tgz";
       path = fetchurl {
         name = "is_extendable___is_extendable_0.1.1.tgz";
@@ -5898,6 +6010,14 @@
       };
     }
     {
+      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";
@@ -5922,11 +6042,11 @@
       };
     }
     {
-      name = "is_number_object___is_number_object_1.0.3.tgz";
+      name = "is_number_object___is_number_object_1.0.4.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_object___is_number_object_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz";
+        sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197";
       };
     }
     {
@@ -5954,27 +6074,35 @@
       };
     }
     {
-      name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
+      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 {
-        name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
-        sha1 = "d225ec23132e89edd38fda767472e62e65f1106d";
+        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_1.0.1.tgz";
+      name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz";
       path = fetchurl {
-        name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz";
-        sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52";
+        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_1.0.1.tgz";
+      name = "is_path_inside___is_path_inside_2.1.0.tgz";
       path = fetchurl {
-        name = "is_path_inside___is_path_inside_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz";
-        sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
+        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";
       };
     }
     {
@@ -6002,11 +6130,11 @@
       };
     }
     {
-      name = "is_regex___is_regex_1.0.4.tgz";
+      name = "is_regex___is_regex_1.0.5.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";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
+        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
       };
     }
     {
@@ -6042,11 +6170,11 @@
       };
     }
     {
-      name = "is_string___is_string_1.0.4.tgz";
+      name = "is_string___is_string_1.0.5.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_string___is_string_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
+        sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
       };
     }
     {
@@ -6066,11 +6194,11 @@
       };
     }
     {
-      name = "is_symbol___is_symbol_1.0.2.tgz";
+      name = "is_symbol___is_symbol_1.0.3.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_symbol___is_symbol_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937";
       };
     }
     {
@@ -6098,6 +6226,14 @@
       };
     }
     {
+      name = "is_wsl___is_wsl_2.1.1.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 = "isarray___isarray_0.0.1.tgz";
       path = fetchurl {
         name = "isarray___isarray_0.0.1.tgz";
@@ -6138,14 +6274,6 @@
       };
     }
     {
-      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";
@@ -6186,11 +6314,11 @@
       };
     }
     {
-      name = "istanbul_reports___istanbul_reports_2.2.6.tgz";
+      name = "istanbul_reports___istanbul_reports_2.2.7.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 = "istanbul_reports___istanbul_reports_2.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz";
+        sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931";
       };
     }
     {
@@ -6242,11 +6370,11 @@
       };
     }
     {
-      name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz";
+      name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz";
       path = fetchurl {
-        name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz";
-        sha1 = "aad6393a9d4b565b69a609109bf469f62bf18ccc";
+        name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz";
+        sha1 = "4cd0042f58b4ab666950d96532ecb2fc188f96fb";
       };
     }
     {
@@ -6410,11 +6538,11 @@
       };
     }
     {
-      name = "jest_watch_typeahead___jest_watch_typeahead_0.4.0.tgz";
+      name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz";
       path = fetchurl {
-        name = "jest_watch_typeahead___jest_watch_typeahead_0.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.0.tgz";
-        sha1 = "4d5356839a85421588ce452d2440bf0d25308397";
+        name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz";
+        sha1 = "e5be959698a7fa2302229a5082c488c3c8780a4a";
       };
     }
     {
@@ -6434,6 +6562,14 @@
       };
     }
     {
+      name = "jest_worker___jest_worker_25.1.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___jest_24.9.0.tgz";
       path = fetchurl {
         name = "jest___jest_24.9.0.tgz";
@@ -6458,14 +6594,6 @@
       };
     }
     {
-      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";
@@ -6514,11 +6642,11 @@
       };
     }
     {
-      name = "jsdom___jsdom_15.2.0.tgz";
+      name = "jsdom___jsdom_15.2.1.tgz";
       path = fetchurl {
-        name = "jsdom___jsdom_15.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.0.tgz";
-        sha1 = "4baead4f464e733533ed6ac607ce440918cf5cbb";
+        name = "jsdom___jsdom_15.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz";
+        sha1 = "d2feb1aef7183f86be521b8c6833ff5296d07ec5";
       };
     }
     {
@@ -6634,11 +6762,11 @@
       };
     }
     {
-      name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz";
+      name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz";
       path = fetchurl {
-        name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz";
-        sha1 = "4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb";
+        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";
       };
     }
     {
@@ -6690,11 +6818,11 @@
       };
     }
     {
-      name = "kind_of___kind_of_6.0.2.tgz";
+      name = "kind_of___kind_of_6.0.3.tgz";
       path = fetchurl {
-        name = "kind_of___kind_of_6.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz";
-        sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051";
+        name = "kind_of___kind_of_6.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+        sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
       };
     }
     {
@@ -6754,6 +6882,14 @@
       };
     }
     {
+      name = "levenary___levenary_1.1.1.tgz";
+      path = fetchurl {
+        name = "levenary___levenary_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz";
+        sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77";
+      };
+    }
+    {
       name = "levn___levn_0.3.0.tgz";
       path = fetchurl {
         name = "levn___levn_0.3.0.tgz";
@@ -6762,6 +6898,14 @@
       };
     }
     {
+      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 = "load_json_file___load_json_file_2.0.0.tgz";
       path = fetchurl {
         name = "load_json_file___load_json_file_2.0.0.tgz";
@@ -6802,6 +6946,14 @@
       };
     }
     {
+      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 = "locate_path___locate_path_2.0.0.tgz";
       path = fetchurl {
         name = "locate_path___locate_path_2.0.0.tgz";
@@ -6818,6 +6970,14 @@
       };
     }
     {
+      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_es___lodash_es_4.17.15.tgz";
       path = fetchurl {
         name = "lodash_es___lodash_es_4.17.15.tgz";
@@ -6874,22 +7034,6 @@
       };
     }
     {
-      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.isobject___lodash.isobject_3.0.2.tgz";
-      path = fetchurl {
-        name = "lodash.isobject___lodash.isobject_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz";
-        sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d";
-      };
-    }
-    {
       name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
       path = fetchurl {
         name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
@@ -6946,22 +7090,6 @@
       };
     }
     {
-      name = "lodash.tonumber___lodash.tonumber_4.0.3.tgz";
-      path = fetchurl {
-        name = "lodash.tonumber___lodash.tonumber_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz";
-        sha1 = "0b96b31b35672793eb7f5a63ee791f1b9e9025d9";
-      };
-    }
-    {
-      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";
@@ -6978,11 +7106,11 @@
       };
     }
     {
-      name = "loglevel___loglevel_1.6.4.tgz";
+      name = "loglevel___loglevel_1.6.7.tgz";
       path = fetchurl {
-        name = "loglevel___loglevel_1.6.4.tgz";
-        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz";
-        sha1 = "f408f4f006db8354d0577dcf6d33485b3cb90d56";
+        name = "loglevel___loglevel_1.6.7.tgz";
+        url  = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz";
+        sha1 = "b3e034233188c68b889f5b862415306f565e2c56";
       };
     }
     {
@@ -6994,6 +7122,14 @@
       };
     }
     {
+      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 = "loose_envify___loose_envify_1.4.0.tgz";
       path = fetchurl {
         name = "loose_envify___loose_envify_1.4.0.tgz";
@@ -7002,11 +7138,11 @@
       };
     }
     {
-      name = "lower_case___lower_case_1.1.4.tgz";
+      name = "lower_case___lower_case_2.0.1.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 = "lower_case___lower_case_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz";
+        sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7";
       };
     }
     {
@@ -7026,6 +7162,14 @@
       };
     }
     {
+      name = "make_dir___make_dir_3.0.2.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 = "makeerror___makeerror_1.0.11.tgz";
       path = fetchurl {
         name = "makeerror___makeerror_1.0.11.tgz";
@@ -7082,14 +7226,6 @@
       };
     }
     {
-      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";
@@ -7186,27 +7322,19 @@
       };
     }
     {
-      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.42.0.tgz";
+      name = "mime_db___mime_db_1.43.0.tgz";
       path = fetchurl {
-        name = "mime_db___mime_db_1.42.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz";
-        sha1 = "3e252907b4c7adb906597b4b65636272cf9e7bac";
+        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";
+      name = "mime_types___mime_types_2.1.26.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";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
+        sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
       };
     }
     {
@@ -7226,14 +7354,6 @@
       };
     }
     {
-      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";
@@ -7242,11 +7362,11 @@
       };
     }
     {
-      name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.0.tgz";
+      name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.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 = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz";
+        sha1 = "47f2cf07aa165ab35733b1fc97d4c46c0564339e";
       };
     }
     {
@@ -7290,11 +7410,27 @@
       };
     }
     {
-      name = "minimist___minimist_0.0.10.tgz";
+      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 = "minimist___minimist_0.0.10.tgz";
-        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz";
-        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+        name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz";
+        sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a";
       };
     }
     {
@@ -7306,6 +7442,14 @@
       };
     }
     {
+      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 = "minizlib___minizlib_1.3.3.tgz";
       path = fetchurl {
         name = "minizlib___minizlib_1.3.3.tgz";
@@ -7370,11 +7514,11 @@
       };
     }
     {
-      name = "moo___moo_0.4.3.tgz";
+      name = "moo___moo_0.5.1.tgz";
       path = fetchurl {
-        name = "moo___moo_0.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz";
-        sha1 = "3f847a26f31cf625a956a87f2b10fbc013bfd10e";
+        name = "moo___moo_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz";
+        sha1 = "7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4";
       };
     }
     {
@@ -7426,11 +7570,11 @@
       };
     }
     {
-      name = "mute_stream___mute_stream_0.0.7.tgz";
+      name = "mute_stream___mute_stream_0.0.8.tgz";
       path = fetchurl {
-        name = "mute_stream___mute_stream_0.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+        name = "mute_stream___mute_stream_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz";
+        sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d";
       };
     }
     {
@@ -7458,19 +7602,19 @@
       };
     }
     {
-      name = "nearley___nearley_2.19.0.tgz";
+      name = "nearley___nearley_2.19.1.tgz";
       path = fetchurl {
-        name = "nearley___nearley_2.19.0.tgz";
-        url  = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz";
-        sha1 = "37717781d0fd0f2bfc95e233ebd75678ca4bda46";
+        name = "nearley___nearley_2.19.1.tgz";
+        url  = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz";
+        sha1 = "4af4006e16645ff800e9f993c3af039857d9dbdc";
       };
     }
     {
-      name = "needle___needle_2.4.0.tgz";
+      name = "needle___needle_2.3.2.tgz";
       path = fetchurl {
-        name = "needle___needle_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz";
-        sha1 = "6833e74975c444642590e15a750288c5f939b57c";
+        name = "needle___needle_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz";
+        sha1 = "3342dea100b7160960a450dc8c22160ac712a528";
       };
     }
     {
@@ -7506,19 +7650,19 @@
       };
     }
     {
-      name = "nise___nise_1.5.2.tgz";
+      name = "nise___nise_1.5.3.tgz";
       path = fetchurl {
-        name = "nise___nise_1.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/nise/-/nise-1.5.2.tgz";
-        sha1 = "b6d29af10e48b321b307e10e065199338eeb2652";
+        name = "nise___nise_1.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz";
+        sha1 = "9d2cfe37d44f57317766c6e9408a359c5d3ac1f7";
       };
     }
     {
-      name = "no_case___no_case_2.3.2.tgz";
+      name = "no_case___no_case_3.0.3.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 = "no_case___no_case_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz";
+        sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8";
       };
     }
     {
@@ -7530,14 +7674,6 @@
       };
     }
     {
-      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";
@@ -7578,19 +7714,19 @@
       };
     }
     {
-      name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
+      name = "node_pre_gyp___node_pre_gyp_0.14.0.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_pre_gyp___node_pre_gyp_0.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+        sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83";
       };
     }
     {
-      name = "node_releases___node_releases_1.1.36.tgz";
+      name = "node_releases___node_releases_1.1.49.tgz";
       path = fetchurl {
-        name = "node_releases___node_releases_1.1.36.tgz";
-        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.36.tgz";
-        sha1 = "44b7cb8254138e87bdbfa47761d0f825e20900b4";
+        name = "node_releases___node_releases_1.1.49.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz";
+        sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e";
       };
     }
     {
@@ -7650,19 +7786,27 @@
       };
     }
     {
-      name = "npm_bundled___npm_bundled_1.0.6.tgz";
+      name = "npm_bundled___npm_bundled_1.1.1.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_bundled___npm_bundled_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b";
       };
     }
     {
-      name = "npm_packlist___npm_packlist_1.4.6.tgz";
+      name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
       path = fetchurl {
-        name = "npm_packlist___npm_packlist_1.4.6.tgz";
-        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz";
-        sha1 = "53ba3ed11f8523079f1457376dd379ee4ea42ff4";
+        name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2";
+      };
+    }
+    {
+      name = "npm_packlist___npm_packlist_1.4.8.tgz";
+      path = fetchurl {
+        name = "npm_packlist___npm_packlist_1.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz";
+        sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e";
       };
     }
     {
@@ -7706,11 +7850,11 @@
       };
     }
     {
-      name = "nwsapi___nwsapi_2.1.4.tgz";
+      name = "nwsapi___nwsapi_2.2.0.tgz";
       path = fetchurl {
-        name = "nwsapi___nwsapi_2.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz";
-        sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f";
+        name = "nwsapi___nwsapi_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz";
+        sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7";
       };
     }
     {
@@ -7738,27 +7882,27 @@
       };
     }
     {
-      name = "object_hash___object_hash_1.3.1.tgz";
+      name = "object_hash___object_hash_2.0.3.tgz";
       path = fetchurl {
-        name = "object_hash___object_hash_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz";
-        sha1 = "fde452098a951cb145f039bb7d455449ddc126df";
+        name = "object_hash___object_hash_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz";
+        sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea";
       };
     }
     {
-      name = "object_inspect___object_inspect_1.6.0.tgz";
+      name = "object_inspect___object_inspect_1.7.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";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
       };
     }
     {
-      name = "object_is___object_is_1.0.1.tgz";
+      name = "object_is___object_is_1.0.2.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_is___object_is_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz";
+        sha1 = "6b80eb84fe451498f65007982f035a5b445edec4";
       };
     }
     {
@@ -7794,27 +7938,27 @@
       };
     }
     {
-      name = "object.entries___object.entries_1.1.0.tgz";
+      name = "object.entries___object.entries_1.1.1.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.entries___object.entries_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz";
+        sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b";
       };
     }
     {
-      name = "object.fromentries___object.fromentries_2.0.1.tgz";
+      name = "object.fromentries___object.fromentries_2.0.2.tgz";
       path = fetchurl {
-        name = "object.fromentries___object.fromentries_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz";
-        sha1 = "050f077855c7af8ae6649f45c80b16ee2d31e704";
+        name = "object.fromentries___object.fromentries_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz";
+        sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9";
       };
     }
     {
-      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.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.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649";
       };
     }
     {
@@ -7826,11 +7970,11 @@
       };
     }
     {
-      name = "object.values___object.values_1.1.0.tgz";
+      name = "object.values___object.values_1.1.1.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 = "object.values___object.values_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz";
+        sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e";
       };
     }
     {
@@ -7866,19 +8010,19 @@
       };
     }
     {
-      name = "onetime___onetime_2.0.1.tgz";
+      name = "onetime___onetime_5.1.0.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";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz";
+        sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5";
       };
     }
     {
-      name = "open___open_6.4.0.tgz";
+      name = "open___open_7.0.2.tgz";
       path = fetchurl {
-        name = "open___open_6.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz";
-        sha1 = "5c13e96d0dc894686164f18965ecfe889ecfc8a9";
+        name = "open___open_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz";
+        sha1 = "fb3681f11f157f2361d2392307548ca1792960e8";
       };
     }
     {
@@ -7890,14 +8034,6 @@
       };
     }
     {
-      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";
@@ -7906,11 +8042,11 @@
       };
     }
     {
-      name = "optionator___optionator_0.8.2.tgz";
+      name = "optionator___optionator_0.8.3.tgz";
       path = fetchurl {
-        name = "optionator___optionator_0.8.2.tgz";
-        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+        name = "optionator___optionator_0.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz";
+        sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
       };
     }
     {
@@ -8002,11 +8138,11 @@
       };
     }
     {
-      name = "p_limit___p_limit_2.2.1.tgz";
+      name = "p_limit___p_limit_2.2.2.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_limit___p_limit_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
+        sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
       };
     }
     {
@@ -8026,11 +8162,27 @@
       };
     }
     {
-      name = "p_map___p_map_1.2.0.tgz";
+      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_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz";
-        sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b";
+        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";
       };
     }
     {
@@ -8042,6 +8194,14 @@
       };
     }
     {
+      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_1.0.0.tgz";
       path = fetchurl {
         name = "p_try___p_try_1.0.0.tgz";
@@ -8058,11 +8218,11 @@
       };
     }
     {
-      name = "pako___pako_1.0.10.tgz";
+      name = "pako___pako_1.0.11.tgz";
       path = fetchurl {
-        name = "pako___pako_1.0.10.tgz";
-        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz";
-        sha1 = "4328badb5086a426aa90f541977d4955da5c9732";
+        name = "pako___pako_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz";
+        sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf";
       };
     }
     {
@@ -8074,11 +8234,11 @@
       };
     }
     {
-      name = "param_case___param_case_2.1.1.tgz";
+      name = "param_case___param_case_3.0.3.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 = "param_case___param_case_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz";
+        sha1 = "4be41f8399eff621c56eebb829a5e451d9801238";
       };
     }
     {
@@ -8114,6 +8274,14 @@
       };
     }
     {
+      name = "parse_json___parse_json_5.0.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 = "parse5___parse5_4.0.0.tgz";
       path = fetchurl {
         name = "parse5___parse5_4.0.0.tgz";
@@ -8146,6 +8314,14 @@
       };
     }
     {
+      name = "pascal_case___pascal_case_3.1.1.tgz";
+      path = fetchurl {
+        name = "pascal_case___pascal_case_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz";
+        sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f";
+      };
+    }
+    {
       name = "pascalcase___pascalcase_0.1.1.tgz";
       path = fetchurl {
         name = "pascalcase___pascalcase_0.1.1.tgz";
@@ -8186,6 +8362,14 @@
       };
     }
     {
+      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";
@@ -8210,6 +8394,14 @@
       };
     }
     {
+      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 {
         name = "path_parse___path_parse_1.0.6.tgz";
@@ -8226,11 +8418,11 @@
       };
     }
     {
-      name = "path_to_regexp___path_to_regexp_1.7.0.tgz";
+      name = "path_to_regexp___path_to_regexp_1.8.0.tgz";
       path = fetchurl {
-        name = "path_to_regexp___path_to_regexp_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
-        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+        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";
       };
     }
     {
@@ -8250,6 +8442,14 @@
       };
     }
     {
+      name = "path_type___path_type_4.0.0.tgz";
+      path = fetchurl {
+        name = "path_type___path_type_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz";
+        sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b";
+      };
+    }
+    {
       name = "pbkdf2___pbkdf2_3.0.17.tgz";
       path = fetchurl {
         name = "pbkdf2___pbkdf2_3.0.17.tgz";
@@ -8266,11 +8466,11 @@
       };
     }
     {
-      name = "picomatch___picomatch_2.0.7.tgz";
+      name = "picomatch___picomatch_2.2.1.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.1.tgz";
+        url  = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz";
+        sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a";
       };
     }
     {
@@ -8346,11 +8546,19 @@
       };
     }
     {
-      name = "pkg_up___pkg_up_2.0.0.tgz";
+      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 = "pkg_up___pkg_up_3.1.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 = "pkg_up___pkg_up_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz";
+        sha1 = "100ec235cc150e4fd42519412596a28512a0def5";
       };
     }
     {
@@ -8362,19 +8570,19 @@
       };
     }
     {
-      name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz";
+      name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz";
       path = fetchurl {
-        name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz";
-        sha1 = "62a1cd3068f46d564bb33c56eb250e4d586676eb";
+        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 = "popper.js___popper.js_1.16.0.tgz";
+      name = "popper.js___popper.js_1.16.1.tgz";
       path = fetchurl {
-        name = "popper.js___popper.js_1.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz";
-        sha1 = "2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3";
+        name = "popper.js___popper.js_1.16.1.tgz";
+        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz";
+        sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b";
       };
     }
     {
@@ -8394,27 +8602,27 @@
       };
     }
     {
-      name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz";
+      name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz";
       path = fetchurl {
-        name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz";
-        sha1 = "b2a721a0d279c2f9103a36331c88981526428cc7";
+        name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz";
+        sha1 = "d93e46b504589e94ac7277b0463226c68041a880";
       };
     }
     {
-      name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz";
+      name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz";
       path = fetchurl {
-        name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz";
-        sha1 = "dc48d6a8ddbff188a80a000b7393436cb18aed88";
+        name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz";
+        sha1 = "1248d2d935fb72053c8e1f61a84a57292d9f65e9";
       };
     }
     {
-      name = "postcss_calc___postcss_calc_7.0.1.tgz";
+      name = "postcss_calc___postcss_calc_7.0.2.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_calc___postcss_calc_7.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz";
+        sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1";
       };
     }
     {
@@ -8602,11 +8810,11 @@
       };
     }
     {
-      name = "postcss_initial___postcss_initial_3.0.1.tgz";
+      name = "postcss_initial___postcss_initial_3.0.2.tgz";
       path = fetchurl {
-        name = "postcss_initial___postcss_initial_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz";
-        sha1 = "99d319669a13d6c06ef8e70d852f68cb1b399b61";
+        name = "postcss_initial___postcss_initial_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz";
+        sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d";
       };
     }
     {
@@ -8706,27 +8914,27 @@
       };
     }
     {
-      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz";
+      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_2.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz";
-        sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63";
+        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";
+      name = "postcss_modules_scope___postcss_modules_scope_2.1.1.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_scope___postcss_modules_scope_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz";
+        sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba";
       };
     }
     {
-      name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz";
+      name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz";
       path = fetchurl {
-        name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz";
-        sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64";
+        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";
       };
     }
     {
@@ -8810,11 +9018,11 @@
       };
     }
     {
-      name = "postcss_normalize___postcss_normalize_7.0.1.tgz";
+      name = "postcss_normalize___postcss_normalize_8.0.1.tgz";
       path = fetchurl {
-        name = "postcss_normalize___postcss_normalize_7.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-7.0.1.tgz";
-        sha1 = "eb51568d962b8aa61a8318383c8bb7e54332282e";
+        name = "postcss_normalize___postcss_normalize_8.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz";
+        sha1 = "90e80a7763d7fdf2da6f2f0f82be832ce4f66776";
       };
     }
     {
@@ -8914,11 +9122,11 @@
       };
     }
     {
-      name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+      name = "postcss_selector_parser___postcss_selector_parser_3.1.2.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_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz";
+        sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270";
       };
     }
     {
@@ -8962,11 +9170,11 @@
       };
     }
     {
-      name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
+      name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz";
       path = fetchurl {
-        name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz";
-        sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9";
+        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";
       };
     }
     {
@@ -8978,19 +9186,19 @@
       };
     }
     {
-      name = "postcss___postcss_7.0.14.tgz";
+      name = "postcss___postcss_7.0.21.tgz";
       path = fetchurl {
-        name = "postcss___postcss_7.0.14.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz";
-        sha1 = "4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5";
+        name = "postcss___postcss_7.0.21.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz";
+        sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17";
       };
     }
     {
-      name = "postcss___postcss_7.0.18.tgz";
+      name = "postcss___postcss_7.0.27.tgz";
       path = fetchurl {
-        name = "postcss___postcss_7.0.18.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz";
-        sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233";
+        name = "postcss___postcss_7.0.27.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz";
+        sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9";
       };
     }
     {
@@ -9018,11 +9226,11 @@
       };
     }
     {
-      name = "prettier___prettier_1.18.2.tgz";
+      name = "prettier___prettier_1.19.1.tgz";
       path = fetchurl {
-        name = "prettier___prettier_1.18.2.tgz";
-        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz";
-        sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea";
+        name = "prettier___prettier_1.19.1.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz";
+        sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
       };
     }
     {
@@ -9106,19 +9314,11 @@
       };
     }
     {
-      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.2.1.tgz";
+      name = "prompts___prompts_2.3.1.tgz";
       path = fetchurl {
-        name = "prompts___prompts_2.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz";
-        sha1 = "f901dd2a2dfee080359c0e20059b24188d75ad35";
+        name = "prompts___prompts_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz";
+        sha1 = "b63a9ce2809f106fa9ae1277c275b167af46ea05";
       };
     }
     {
@@ -9154,11 +9354,11 @@
       };
     }
     {
-      name = "psl___psl_1.4.0.tgz";
+      name = "psl___psl_1.7.0.tgz";
       path = fetchurl {
-        name = "psl___psl_1.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz";
-        sha1 = "5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2";
+        name = "psl___psl_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz";
+        sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c";
       };
     }
     {
@@ -9346,59 +9546,51 @@
       };
     }
     {
-      name = "react_app_polyfill___react_app_polyfill_1.0.4.tgz";
-      path = fetchurl {
-        name = "react_app_polyfill___react_app_polyfill_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.4.tgz";
-        sha1 = "4dd2636846b585c2d842b1e44e1bc29044345874";
-      };
-    }
-    {
-      name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.1.tgz";
+      name = "react_app_polyfill___react_app_polyfill_1.0.6.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_app_polyfill___react_app_polyfill_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz";
+        sha1 = "890f8d7f2842ce6073f030b117de9130a5f385f0";
       };
     }
     {
-      name = "react_dev_utils___react_dev_utils_9.1.0.tgz";
+      name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz";
       path = fetchurl {
-        name = "react_dev_utils___react_dev_utils_9.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz";
-        sha1 = "3ad2bb8848a32319d760d0a84c56c14bdaae5e81";
+        name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz";
+        sha1 = "d82a437e081e68dfca3761fbd57dbf2abdda1316";
       };
     }
     {
-      name = "react_dom___react_dom_16.10.2.tgz";
+      name = "react_dev_utils___react_dev_utils_10.2.0.tgz";
       path = fetchurl {
-        name = "react_dom___react_dom_16.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz";
-        sha1 = "4840bce5409176bc3a1f2bd8cb10b92db452fda6";
+        name = "react_dev_utils___react_dev_utils_10.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz";
+        sha1 = "b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0";
       };
     }
     {
-      name = "react_error_overlay___react_error_overlay_6.0.3.tgz";
+      name = "react_dom___react_dom_16.12.0.tgz";
       path = fetchurl {
-        name = "react_error_overlay___react_error_overlay_6.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz";
-        sha1 = "c378c4b0a21e88b2e159a3e62b2f531fd63bf60d";
+        name = "react_dom___react_dom_16.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz";
+        sha1 = "0da4b714b8d13c2038c9396b54a92baea633fe11";
       };
     }
     {
-      name = "react_is___react_is_16.11.0.tgz";
+      name = "react_error_overlay___react_error_overlay_6.0.6.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_error_overlay___react_error_overlay_6.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz";
+        sha1 = "ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2";
       };
     }
     {
-      name = "react_is___react_is_16.10.2.tgz";
+      name = "react_is___react_is_16.12.0.tgz";
       path = fetchurl {
-        name = "react_is___react_is_16.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz";
-        sha1 = "984120fd4d16800e9a738208ab1fba422d23b5ab";
+        name = "react_is___react_is_16.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz";
+        sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c";
       };
     }
     {
@@ -9410,11 +9602,11 @@
       };
     }
     {
-      name = "react_popper___react_popper_1.3.4.tgz";
+      name = "react_popper___react_popper_1.3.7.tgz";
       path = fetchurl {
-        name = "react_popper___react_popper_1.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.4.tgz";
-        sha1 = "f0cd3b0d30378e1f663b0d79bcc8614221652ced";
+        name = "react_popper___react_popper_1.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz";
+        sha1 = "f6a3471362ef1f0d10a4963673789de1baca2324";
       };
     }
     {
@@ -9426,19 +9618,19 @@
       };
     }
     {
-      name = "react_scripts___react_scripts_3.2.0.tgz";
+      name = "react_scripts___react_scripts_3.4.0.tgz";
       path = fetchurl {
-        name = "react_scripts___react_scripts_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.2.0.tgz";
-        sha1 = "58ccd6b4ffa27f1b4d2986cbdcaa916660e9e33c";
+        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_test_renderer___react_test_renderer_16.11.0.tgz";
+      name = "react_test_renderer___react_test_renderer_16.12.0.tgz";
       path = fetchurl {
-        name = "react_test_renderer___react_test_renderer_16.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.11.0.tgz";
-        sha1 = "72574566496462c808ac449b0287a4c0a1a7d8f8";
+        name = "react_test_renderer___react_test_renderer_16.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz";
+        sha1 = "11417ffda579306d4e841a794d32140f3da1b43f";
       };
     }
     {
@@ -9450,19 +9642,19 @@
       };
     }
     {
-      name = "react___react_16.10.2.tgz";
+      name = "react___react_16.12.0.tgz";
       path = fetchurl {
-        name = "react___react_16.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz";
-        sha1 = "a5ede5cdd5c536f745173c8da47bda64797a4cf0";
+        name = "react___react_16.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz";
+        sha1 = "0c0a9c6a142429e3614834d5a778e18aa78a0b83";
       };
     }
     {
-      name = "reactstrap___reactstrap_8.0.1.tgz";
+      name = "reactstrap___reactstrap_8.4.1.tgz";
       path = fetchurl {
-        name = "reactstrap___reactstrap_8.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.0.1.tgz";
-        sha1 = "0b663c8195f540bc1d6d5dbcbcf73cab56fe7c79";
+        name = "reactstrap___reactstrap_8.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.4.1.tgz";
+        sha1 = "c7f63b9057f58b52833061711ebe235b9ec4e3e5";
       };
     }
     {
@@ -9498,19 +9690,19 @@
       };
     }
     {
-      name = "readable_stream___readable_stream_2.3.6.tgz";
+      name = "readable_stream___readable_stream_2.3.7.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 = "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.4.0.tgz";
+      name = "readable_stream___readable_stream_3.6.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 = "readable_stream___readable_stream_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198";
       };
     }
     {
@@ -9522,11 +9714,11 @@
       };
     }
     {
-      name = "readdirp___readdirp_3.2.0.tgz";
+      name = "readdirp___readdirp_3.3.0.tgz";
       path = fetchurl {
-        name = "readdirp___readdirp_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz";
-        sha1 = "c30c33352b12c96dfb4b895421a49fd5a9593839";
+        name = "readdirp___readdirp_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz";
+        sha1 = "984458d13a1e42e2e9f5841b129e162f369aff17";
       };
     }
     {
@@ -9570,14 +9762,6 @@
       };
     }
     {
-      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.11.1.tgz";
       path = fetchurl {
         name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz";
@@ -9586,6 +9770,14 @@
       };
     }
     {
+      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_transform___regenerator_transform_0.14.1.tgz";
       path = fetchurl {
         name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
@@ -9610,11 +9802,11 @@
       };
     }
     {
-      name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz";
+      name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
       path = fetchurl {
-        name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz";
-        sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c";
+        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";
       };
     }
     {
@@ -9626,6 +9818,14 @@
       };
     }
     {
+      name = "regexpp___regexpp_3.0.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 = "regexpu_core___regexpu_core_4.6.0.tgz";
       path = fetchurl {
         name = "regexpu_core___regexpu_core_4.6.0.tgz";
@@ -9634,19 +9834,19 @@
       };
     }
     {
-      name = "regjsgen___regjsgen_0.5.0.tgz";
+      name = "regjsgen___regjsgen_0.5.1.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.1.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz";
+        sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c";
       };
     }
     {
-      name = "regjsparser___regjsparser_0.6.0.tgz";
+      name = "regjsparser___regjsparser_0.6.3.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.3.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz";
+        sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460";
       };
     }
     {
@@ -9690,27 +9890,27 @@
       };
     }
     {
-      name = "request_promise_core___request_promise_core_1.1.2.tgz";
+      name = "request_promise_core___request_promise_core_1.1.3.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_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.7.tgz";
+      name = "request_promise_native___request_promise_native_1.0.8.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_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";
       };
     }
     {
@@ -9778,11 +9978,11 @@
       };
     }
     {
-      name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz";
+      name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz";
       path = fetchurl {
-        name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz";
-        sha1 = "54d8181d33cd1b66a59544d05cadf8e4aa7d37cc";
+        name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz";
+        sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0";
       };
     }
     {
@@ -9802,19 +10002,27 @@
       };
     }
     {
-      name = "resolve___resolve_1.12.0.tgz";
+      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.15.1.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
-        sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
+        name = "resolve___resolve_1.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz";
+        sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8";
       };
     }
     {
-      name = "restore_cursor___restore_cursor_2.0.0.tgz";
+      name = "restore_cursor___restore_cursor_3.1.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";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz";
+        sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e";
       };
     }
     {
@@ -9826,6 +10034,14 @@
       };
     }
     {
+      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 = "rework_visit___rework_visit_1.0.0.tgz";
       path = fetchurl {
         name = "rework_visit___rework_visit_1.0.0.tgz";
@@ -9914,11 +10130,11 @@
       };
     }
     {
-      name = "rxjs___rxjs_6.5.3.tgz";
+      name = "rxjs___rxjs_6.5.4.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_6.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz";
-        sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a";
+        name = "rxjs___rxjs_6.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
+        sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
       };
     }
     {
@@ -9962,19 +10178,27 @@
       };
     }
     {
-      name = "sanitize_html___sanitize_html_1.20.1.tgz";
+      name = "sanitize_html___sanitize_html_1.21.1.tgz";
       path = fetchurl {
-        name = "sanitize_html___sanitize_html_1.20.1.tgz";
-        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz";
-        sha1 = "f6effdf55dd398807171215a62bfc21811bacf85";
+        name = "sanitize_html___sanitize_html_1.21.1.tgz";
+        url  = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz";
+        sha1 = "1647d15c0c672901aa41eac1b86d0c38146d30ce";
       };
     }
     {
-      name = "sass_loader___sass_loader_7.2.0.tgz";
+      name = "sanitize.css___sanitize.css_10.0.0.tgz";
       path = fetchurl {
-        name = "sass_loader___sass_loader_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz";
-        sha1 = "e34115239309d15b2527cb62b5dfefb62a96ff7f";
+        name = "sanitize.css___sanitize.css_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz";
+        sha1 = "b5cb2547e96d8629a60947544665243b1dc3657a";
+      };
+    }
+    {
+      name = "sass_loader___sass_loader_8.0.2.tgz";
+      path = fetchurl {
+        name = "sass_loader___sass_loader_8.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz";
+        sha1 = "debecd8c3ce243c76454f2e8290482150380090d";
       };
     }
     {
@@ -9994,19 +10218,11 @@
       };
     }
     {
-      name = "scheduler___scheduler_0.16.2.tgz";
+      name = "scheduler___scheduler_0.18.0.tgz";
       path = fetchurl {
-        name = "scheduler___scheduler_0.16.2.tgz";
-        url  = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz";
-        sha1 = "f74cd9d33eff6fc554edfb79864868e4819132c1";
-      };
-    }
-    {
-      name = "scheduler___scheduler_0.17.0.tgz";
-      path = fetchurl {
-        name = "scheduler___scheduler_0.17.0.tgz";
-        url  = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz";
-        sha1 = "7c9c673e4ec781fac853927916d1c426b6f3ddfe";
+        name = "scheduler___scheduler_0.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz";
+        sha1 = "5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4";
       };
     }
     {
@@ -10018,11 +10234,11 @@
       };
     }
     {
-      name = "schema_utils___schema_utils_2.5.0.tgz";
+      name = "schema_utils___schema_utils_2.6.4.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.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz";
+        sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53";
       };
     }
     {
@@ -10058,6 +10274,14 @@
       };
     }
     {
+      name = "semver___semver_7.0.0.tgz";
+      path = fetchurl {
+        name = "semver___semver_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz";
+        sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e";
+      };
+    }
+    {
       name = "send___send_0.17.1.tgz";
       path = fetchurl {
         name = "send___send_0.17.1.tgz";
@@ -10066,11 +10290,11 @@
       };
     }
     {
-      name = "serialize_javascript___serialize_javascript_1.9.1.tgz";
+      name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
       path = fetchurl {
-        name = "serialize_javascript___serialize_javascript_1.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz";
-        sha1 = "cfc200aef77b600c47da9bb8149c943e798c2fdb";
+        name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
+        sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
       };
     }
     {
@@ -10162,6 +10386,14 @@
       };
     }
     {
+      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 {
         name = "shebang_regex___shebang_regex_1.0.0.tgz";
@@ -10170,6 +10402,14 @@
       };
     }
     {
+      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 = "shell_quote___shell_quote_1.7.2.tgz";
       path = fetchurl {
         name = "shell_quote___shell_quote_1.7.2.tgz";
@@ -10186,6 +10426,14 @@
       };
     }
     {
+      name = "side_channel___side_channel_1.0.2.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 = "signal_exit___signal_exit_3.0.2.tgz";
       path = fetchurl {
         name = "signal_exit___signal_exit_3.0.2.tgz";
@@ -10210,11 +10458,11 @@
       };
     }
     {
-      name = "sisteransi___sisteransi_1.0.3.tgz";
+      name = "sisteransi___sisteransi_1.0.4.tgz";
       path = fetchurl {
-        name = "sisteransi___sisteransi_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz";
-        sha1 = "98168d62b79e3a5e758e27ae63c4a053d748f4eb";
+        name = "sisteransi___sisteransi_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz";
+        sha1 = "386713f1ef688c7c0304dc4c0632898941cad2e3";
       };
     }
     {
@@ -10274,14 +10522,6 @@
       };
     }
     {
-      name = "sockjs_client___sockjs_client_1.3.0.tgz";
-      path = fetchurl {
-        name = "sockjs_client___sockjs_client_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz";
-        sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177";
-      };
-    }
-    {
       name = "sockjs_client___sockjs_client_1.4.0.tgz";
       path = fetchurl {
         name = "sockjs_client___sockjs_client_1.4.0.tgz";
@@ -10314,19 +10554,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.16.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.16.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
+        sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
       };
     }
     {
@@ -10442,6 +10682,14 @@
       };
     }
     {
+      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";
@@ -10506,11 +10754,11 @@
       };
     }
     {
-      name = "stream_shift___stream_shift_1.0.0.tgz";
+      name = "stream_shift___stream_shift_1.0.1.tgz";
       path = fetchurl {
-        name = "stream_shift___stream_shift_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+        name = "stream_shift___stream_shift_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha1 = "d7088281559ab2778424279b0877da3c392d5a3d";
       };
     }
     {
@@ -10562,27 +10810,43 @@
       };
     }
     {
-      name = "string.prototype.trim___string.prototype.trim_1.2.0.tgz";
+      name = "string_width___string_width_4.2.0.tgz";
+      path = fetchurl {
+        name = "string_width___string_width_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz";
+        sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
+      };
+    }
+    {
+      name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
+      path = fetchurl {
+        name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz";
+        sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e";
+      };
+    }
+    {
+      name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trim___string.prototype.trim_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz";
-        sha1 = "75a729b10cfc1be439543dae442129459ce61e3d";
+        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.trimleft___string.prototype.trimleft_2.1.0.tgz";
+      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634";
+        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.0.tgz";
+      name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
+        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";
       };
     }
     {
@@ -10610,11 +10874,11 @@
       };
     }
     {
-      name = "strip_ansi___strip_ansi_5.2.0.tgz";
+      name = "strip_ansi___strip_ansi_6.0.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_ansi___strip_ansi_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz";
+        sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532";
       };
     }
     {
@@ -10634,6 +10898,14 @@
       };
     }
     {
+      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";
@@ -10674,11 +10946,11 @@
       };
     }
     {
-      name = "style_loader___style_loader_1.0.0.tgz";
+      name = "style_loader___style_loader_0.23.1.tgz";
       path = fetchurl {
-        name = "style_loader___style_loader_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz";
-        sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82";
+        name = "style_loader___style_loader_0.23.1.tgz";
+        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz";
+        sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925";
       };
     }
     {
@@ -10714,19 +10986,27 @@
       };
     }
     {
-      name = "svg_parser___svg_parser_2.0.2.tgz";
+      name = "supports_color___supports_color_7.1.0.tgz";
       path = fetchurl {
-        name = "svg_parser___svg_parser_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz";
-        sha1 = "d134cc396fa2681dc64f518330784e98bd801ec8";
+        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.3.0.tgz";
+      name = "svg_parser___svg_parser_2.0.3.tgz";
       path = fetchurl {
-        name = "svgo___svgo_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz";
-        sha1 = "bae51ba95ded9a33a36b7c46ce9c359ae9154313";
+        name = "svg_parser___svg_parser_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz";
+        sha1 = "a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9";
+      };
+    }
+    {
+      name = "svgo___svgo_1.3.2.tgz";
+      path = fetchurl {
+        name = "svgo___svgo_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz";
+        sha1 = "b6dc511c063346c9e415b81e43401145b96d4167";
       };
     }
     {
@@ -10778,19 +11058,27 @@
       };
     }
     {
-      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz";
+      name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz";
       path = fetchurl {
-        name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz";
-        sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4";
+        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___terser_4.3.9.tgz";
+      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
       path = fetchurl {
-        name = "terser___terser_4.3.9.tgz";
-        url  = "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz";
-        sha1 = "e4be37f80553d02645668727777687dad26bbca8";
+        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.3.tgz";
+      path = fetchurl {
+        name = "terser___terser_4.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz";
+        sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87";
       };
     }
     {
@@ -10954,14 +11242,6 @@
       };
     }
     {
-      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 = "tr46___tr46_1.0.1.tgz";
       path = fetchurl {
         name = "tr46___tr46_1.0.1.tgz";
@@ -10970,19 +11250,27 @@
       };
     }
     {
-      name = "ts_pnp___ts_pnp_1.1.4.tgz";
+      name = "ts_pnp___ts_pnp_1.1.5.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 = "ts_pnp___ts_pnp_1.1.6.tgz";
       path = fetchurl {
-        name = "ts_pnp___ts_pnp_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz";
-        sha1 = "ae27126960ebaefb874c6d7fa4729729ab200d90";
+        name = "ts_pnp___ts_pnp_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz";
+        sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a";
       };
     }
     {
-      name = "tslib___tslib_1.10.0.tgz";
+      name = "tslib___tslib_1.11.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.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz";
+        sha1 = "f1f3528301621a53220d58373ae510ff747a66bc";
       };
     }
     {
@@ -11034,11 +11322,11 @@
       };
     }
     {
-      name = "type_fest___type_fest_0.5.2.tgz";
+      name = "type_fest___type_fest_0.8.1.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_fest___type_fest_0.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz";
+        sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
       };
     }
     {
@@ -11058,6 +11346,14 @@
       };
     }
     {
+      name = "type___type_2.0.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 = "typed_styles___typed_styles_0.0.7.tgz";
       path = fetchurl {
         name = "typed_styles___typed_styles_0.0.7.tgz";
@@ -11074,35 +11370,11 @@
       };
     }
     {
-      name = "typescript___typescript_3.7.2.tgz";
-      path = fetchurl {
-        name = "typescript___typescript_3.7.2.tgz";
-        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz";
-        sha1 = "27e489b95fa5909445e9fef5ee48d81697ad18fb";
-      };
-    }
-    {
-      name = "ua_parser_js___ua_parser_js_0.7.20.tgz";
-      path = fetchurl {
-        name = "ua_parser_js___ua_parser_js_0.7.20.tgz";
-        url  = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz";
-        sha1 = "7527178b82f6a62a0f243d1f94fd30e3e3c21098";
-      };
-    }
-    {
-      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.2.tgz";
+      name = "typescript___typescript_3.8.2.tgz";
       path = fetchurl {
-        name = "uglify_js___uglify_js_3.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.2.tgz";
-        sha1 = "fd8048c86d990ddd29fe99d3300e0cb329103f4d";
+        name = "typescript___typescript_3.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz";
+        sha1 = "91d6868aaead7da74f493c553aeff76c0c0b1d5a";
       };
     }
     {
@@ -11218,14 +11490,6 @@
       };
     }
     {
-      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";
@@ -11242,11 +11506,11 @@
       };
     }
     {
-      name = "url_loader___url_loader_2.1.0.tgz";
+      name = "url_loader___url_loader_2.3.0.tgz";
       path = fetchurl {
-        name = "url_loader___url_loader_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz";
-        sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961";
+        name = "url_loader___url_loader_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz";
+        sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b";
       };
     }
     {
@@ -11290,6 +11554,14 @@
       };
     }
     {
+      name = "util.promisify___util.promisify_1.0.1.tgz";
+      path = fetchurl {
+        name = "util.promisify___util.promisify_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz";
+        sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee";
+      };
+    }
+    {
       name = "util___util_0.10.3.tgz";
       path = fetchurl {
         name = "util___util_0.10.3.tgz";
@@ -11322,11 +11594,11 @@
       };
     }
     {
-      name = "uuid___uuid_3.3.3.tgz";
+      name = "uuid___uuid_3.4.0.tgz";
       path = fetchurl {
-        name = "uuid___uuid_3.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz";
-        sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866";
+        name = "uuid___uuid_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+        sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
       };
     }
     {
@@ -11354,11 +11626,11 @@
       };
     }
     {
-      name = "vendors___vendors_1.0.3.tgz";
+      name = "vendors___vendors_1.0.4.tgz";
       path = fetchurl {
-        name = "vendors___vendors_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz";
-        sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0";
+        name = "vendors___vendors_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz";
+        sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e";
       };
     }
     {
@@ -11370,11 +11642,11 @@
       };
     }
     {
-      name = "vm_browserify___vm_browserify_1.1.0.tgz";
+      name = "vm_browserify___vm_browserify_1.1.2.tgz";
       path = fetchurl {
-        name = "vm_browserify___vm_browserify_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz";
-        sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019";
+        name = "vm_browserify___vm_browserify_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0";
       };
     }
     {
@@ -11402,14 +11674,6 @@
       };
     }
     {
-      name = "warning___warning_3.0.0.tgz";
-      path = fetchurl {
-        name = "warning___warning_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz";
-        sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c";
-      };
-    }
-    {
       name = "warning___warning_4.0.3.tgz";
       path = fetchurl {
         name = "warning___warning_4.0.3.tgz";
@@ -11450,11 +11714,11 @@
       };
     }
     {
-      name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz";
+      name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz";
       path = fetchurl {
-        name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz";
-        sha1 = "1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e";
+        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";
       };
     }
     {
@@ -11466,11 +11730,11 @@
       };
     }
     {
-      name = "webpack_manifest_plugin___webpack_manifest_plugin_2.1.1.tgz";
+      name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz";
       path = fetchurl {
-        name = "webpack_manifest_plugin___webpack_manifest_plugin_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.1.1.tgz";
-        sha1 = "6b3e280327815b83152c79f42d0ca13b665773c4";
+        name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz";
+        sha1 = "19ca69b435b0baec7e29fbe90fb4015de2de4f16";
       };
     }
     {
@@ -11482,11 +11746,11 @@
       };
     }
     {
-      name = "webpack___webpack_4.41.0.tgz";
+      name = "webpack___webpack_4.41.5.tgz";
       path = fetchurl {
-        name = "webpack___webpack_4.41.0.tgz";
-        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz";
-        sha1 = "db6a254bde671769f7c14e90a1a55e73602fc70b";
+        name = "webpack___webpack_4.41.5.tgz";
+        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz";
+        sha1 = "3210f1886bce5310e62bb97204d18c263341b77c";
       };
     }
     {
@@ -11546,11 +11810,11 @@
       };
     }
     {
-      name = "whatwg_url___whatwg_url_7.0.0.tgz";
+      name = "whatwg_url___whatwg_url_7.1.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_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz";
+        sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06";
       };
     }
     {
@@ -11570,27 +11834,27 @@
       };
     }
     {
-      name = "wide_align___wide_align_1.1.3.tgz";
+      name = "which___which_2.0.2.tgz";
       path = fetchurl {
-        name = "wide_align___wide_align_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz";
-        sha1 = "ae074e6bdc0c14a431e804e624549c633b000457";
+        name = "which___which_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz";
+        sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1";
       };
     }
     {
-      name = "wordwrap___wordwrap_0.0.3.tgz";
+      name = "wide_align___wide_align_1.1.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 = "wide_align___wide_align_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz";
+        sha1 = "ae074e6bdc0c14a431e804e624549c633b000457";
       };
     }
     {
-      name = "wordwrap___wordwrap_1.0.0.tgz";
+      name = "word_wrap___word_wrap_1.2.3.tgz";
       path = fetchurl {
-        name = "wordwrap___wordwrap_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+        name = "word_wrap___word_wrap_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c";
       };
     }
     {
@@ -11794,11 +12058,11 @@
       };
     }
     {
-      name = "ws___ws_7.1.2.tgz";
+      name = "ws___ws_7.2.1.tgz";
       path = fetchurl {
-        name = "ws___ws_7.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/ws/-/ws-7.1.2.tgz";
-        sha1 = "c672d1629de8bb27a9699eb599be47aeeedd8f73";
+        name = "ws___ws_7.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz";
+        sha1 = "03ed52423cd744084b2cf42ed197c8b65a936b8e";
       };
     }
     {
@@ -11818,14 +12082,6 @@
       };
     }
     {
-      name = "xregexp___xregexp_4.0.0.tgz";
-      path = fetchurl {
-        name = "xregexp___xregexp_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz";
-        sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020";
-      };
-    }
-    {
       name = "xtend___xtend_4.0.2.tgz";
       path = fetchurl {
         name = "xtend___xtend_4.0.2.tgz";
@@ -11850,11 +12106,27 @@
       };
     }
     {
-      name = "yargs_parser___yargs_parser_10.1.0.tgz";
+      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 = "yaml___yaml_1.7.2.tgz";
+      path = fetchurl {
+        name = "yaml___yaml_1.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz";
+        sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2";
+      };
+    }
+    {
+      name = "yargs_parser___yargs_parser_11.1.1.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";
+        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
+        sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
       };
     }
     {
@@ -11866,11 +12138,11 @@
       };
     }
     {
-      name = "yargs___yargs_12.0.2.tgz";
+      name = "yargs___yargs_12.0.5.tgz";
       path = fetchurl {
-        name = "yargs___yargs_12.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz";
-        sha1 = "fe58234369392af33ecbef53819171eff0f5aadc";
+        name = "yargs___yargs_12.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
+        sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
       };
     }
     {
diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index b4626b9e8f82..240dc6263316 100644
--- a/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.2.4";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw";
+    sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml";
   };
 
-  cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf";
+  cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
index ed780f6ce4b6..51e1bcc79483 100644
--- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
@@ -35,4 +35,4 @@ DEPENDENCIES
   riemann-dash (= 0.2.14)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4
diff --git a/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix
index 943fa0af63f3..f6c11703fce7 100644
--- a/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/riemann-dash/default.nix
@@ -9,7 +9,7 @@ bundlerApp {
 
   meta = with lib; {
     description = "A javascript, websockets-powered dashboard for Riemann";
-    homepage = https://github.com/riemann/riemann-dash;
+    homepage = "https://github.com/riemann/riemann-dash";
     license = licenses.mit;
     maintainers = with maintainers; [ manveru nicknovitski ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
index 295a75928805..644af1492cd6 100644
--- a/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://riemann.io/;
+    homepage = "http://riemann.io/";
     description = "A network monitoring system";
     license = licenses.epl10;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix
index adba0277bf77..f109b08d1a6f 100644
--- a/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 let
   generic = { subPackages, pname, postInstall ? "" }:
@@ -20,8 +20,6 @@ let
 
       modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw";
 
-      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
       buildFlagsArray = let
         versionPkg = "github.com/sensu/sensu-go/version";
       in ''
@@ -30,11 +28,11 @@ let
           -X ${versionPkg}.BuildSHA=${shortRev}
       '';
 
-      meta = with stdenv.lib; {
+      meta = {
         homepage = "https://sensu.io";
         description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
-        license = licenses.mit;
-        maintainers = with maintainers; [ thefloweringash ];
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [ thefloweringash ];
       };
     };
 in
diff --git a/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock
index 2d0b31e999fc..9b36bb090f62 100644
--- a/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -159,4 +159,4 @@ DEPENDENCIES
   sensu-plugins-systemd
 
 BUNDLED WITH
-   1.17.2
+   2.1.4
diff --git a/nixpkgs/pkgs/servers/monitoring/sensu/default.nix b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix
index 82c52b18d405..42f6e395c2d6 100644
--- a/nixpkgs/pkgs/servers/monitoring/sensu/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/sensu/default.nix
@@ -46,7 +46,7 @@ bundlerApp {
 
   meta = with lib; {
     description = "A monitoring framework that aims to be simple, malleable, and scalable";
-    homepage    = https://sensuapp.org/;
+    homepage    = "https://sensuapp.org/";
     license     = licenses.mit;
     maintainers = with maintainers; [ theuni peterhoeg manveru nicknovitski ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/seyren/default.nix b/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
index 5312ecb06924..e926d797f9f9 100644
--- a/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An alerting dashboard for Graphite";
-    homepage = https://github.com/scobal/seyren;
+    homepage = "https://github.com/scobal/seyren";
     license = licenses.asl20;
     maintainers = [ maintainers.offline ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
index a246249d7d71..f307032f4141 100644
--- a/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
   version = "0.11.0";
@@ -12,8 +12,6 @@ buildGoModule rec {
 
   modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = "cmd/thanos";
 
   buildFlagsArray = let t = "github.com/prometheus/common/version"; in ''
diff --git a/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix
index 95f8ca4432b3..065af0079b0a 100644
--- a/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/uchiwa/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A Dashboard for the sensu monitoring framework";
-    homepage    = http://sensuapp.org/;
+    homepage    = "http://sensuapp.org/";
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
index 2e7afe5266ea..2b7fb972c90a 100644
--- a/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,12 +1,12 @@
 generic: {
   v44 = generic {
-    version = "4.4.6";
-    sha256 = "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2";
+    version = "4.4.7";
+    sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9";
   };
 
   v40 = generic {
-    version = "4.0.18";
-    sha256 = "105f0mifgm56dd1y8vychq8m2f2wx9a7gv380xv0hrs1q038i1ki";
+    version = "4.0.19";
+    sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr";
   };
 
   v30 = generic {
diff --git a/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
index fe90d4d6408b..c9b2e36d8730 100644
--- a/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
+++ b/nixpkgs/pkgs/servers/monitoring/zipkin/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "Zipkin distributed tracing system";
-    homepage = https://zipkin.io/;
+    homepage = "https://zipkin.io/";
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = [ maintainers.hectorj ];
diff --git a/nixpkgs/pkgs/servers/mpd/clientlib.nix b/nixpkgs/pkgs/servers/mpd/clientlib.nix
index f19d3a1e18a1..cb02a7684785 100644
--- a/nixpkgs/pkgs/servers/mpd/clientlib.nix
+++ b/nixpkgs/pkgs/servers/mpd/clientlib.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
-    homepage = https://www.musicpd.org/libs/libmpdclient/;
+    homepage = "https://www.musicpd.org/libs/libmpdclient/";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ehmry ];
diff --git a/nixpkgs/pkgs/servers/mpd/default.nix b/nixpkgs/pkgs/servers/mpd/default.nix
index e328a79afa69..4f97e3fc7838 100644
--- a/nixpkgs/pkgs/servers/mpd/default.nix
+++ b/nixpkgs/pkgs/servers/mpd/default.nix
@@ -102,13 +102,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.21.20";
+      version = "0.21.21";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "05148zwaf1ix369i1n1fx84j66qa1ab1p3m7781lk3dz5hqf185x";
+        sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng";
       };
 
       buildInputs = [ glib boost ]
diff --git a/nixpkgs/pkgs/servers/mtprotoproxy/default.nix b/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
index 4838fed47fb0..9faa7ec56bf2 100644
--- a/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
+++ b/nixpkgs/pkgs/servers/mtprotoproxy/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Async MTProto proxy for Telegram";
     license     = licenses.mit;
-    homepage    = https://github.com/alexbers/mtprotoproxy;
+    homepage    = "https://github.com/alexbers/mtprotoproxy";
     platforms   = python.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/nixpkgs/pkgs/servers/mxisd/default.nix b/nixpkgs/pkgs/servers/mxisd/default.nix
index c5841d4d1a85..6e9ab2ca99a2 100644
--- a/nixpkgs/pkgs/servers/mxisd/default.nix
+++ b/nixpkgs/pkgs/servers/mxisd/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "a federated matrix identity server";
-    homepage = https://github.com/kamax-matrix/mxisd;
+    homepage = "https://github.com/kamax-matrix/mxisd";
     license = licenses.agpl3;
     maintainers = with maintainers; [ mguentner ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/nas/default.nix b/nixpkgs/pkgs/servers/nas/default.nix
index 0b6451d104f3..2e8b8b14d44f 100644
--- a/nixpkgs/pkgs/servers/nas/default.nix
+++ b/nixpkgs/pkgs/servers/nas/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A network transparent, client/server audio transport system";
-    homepage = http://radscan.com/nas.html;
+    homepage = "http://radscan.com/nas.html";
     license = licenses.mit;
     maintainers = [ maintainers.gnidorah ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/nats-server/default.nix b/nixpkgs/pkgs/servers/nats-server/default.nix
index 7f75579b51c6..3685589fa70a 100644
--- a/nixpkgs/pkgs/servers/nats-server/default.nix
+++ b/nixpkgs/pkgs/servers/nats-server/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
     description = "High-Performance server for NATS";
     license = licenses.asl20;
     maintainers = [ maintainers.swdunlop ];
-    homepage = https://nats.io/;
+    homepage = "https://nats.io/";
     platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
index 29f0f29a1bc6..efaec689a1ab 100644
--- a/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
+++ b/nixpkgs/pkgs/servers/nats-streaming-server/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
     description = "NATS Streaming System Server";
     license = licenses.asl20;
     maintainers = [ maintainers.swdunlop ];
-    homepage = https://nats.io/;
+    homepage = "https://nats.io/";
     platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/servers/neard/default.nix b/nixpkgs/pkgs/servers/neard/default.nix
index de317ada6e45..3b360e308b57 100644
--- a/nixpkgs/pkgs/servers/neard/default.nix
+++ b/nixpkgs/pkgs/servers/neard/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Near Field Communication manager";
-    homepage    = https://01.org/linux-nfc;
+    homepage    = "https://01.org/linux-nfc";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ tstrobel ];
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/news/leafnode/default.nix b/nixpkgs/pkgs/servers/news/leafnode/default.nix
index 0f1a8e120f65..76ce8d2d5733 100644
--- a/nixpkgs/pkgs/servers/news/leafnode/default.nix
+++ b/nixpkgs/pkgs/servers/news/leafnode/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   buildInputs = [ pcre];
 
   meta = {
-    homepage = http://leafnode.sourceforge.net/;
+    homepage = "http://leafnode.sourceforge.net/";
     description = "Leafnode implements a store & forward NNTP proxy";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix
index 008d6bbde398..3c82c1996ef2 100644
--- a/nixpkgs/pkgs/servers/nextcloud/default.nix
+++ b/nixpkgs/pkgs/servers/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, nixosTests }:
 
 let
   generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec {
@@ -10,6 +10,8 @@ let
       inherit sha256;
     };
 
+    passthru.tests = nixosTests.nextcloud;
+
     installPhase = ''
       mkdir -p $out/
       cp -R . $out/
@@ -17,7 +19,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Sharing solution for files, calendars, contacts and more";
-      homepage = https://nextcloud.com;
+      homepage = "https://nextcloud.com";
       maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ];
       license = licenses.agpl3Plus;
       platforms = with platforms; unix;
@@ -31,7 +33,7 @@ in {
   };
 
   nextcloud18 = generic {
-    version = "18.0.2";
-    sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh";
+    version = "18.0.3";
+    sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv";
   };
 }
diff --git a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix
index 0fcb5047549d..dd7e8e4879c5 100644
--- a/nixpkgs/pkgs/servers/nextcloud/news-updater.nix
+++ b/nixpkgs/pkgs/servers/nextcloud/news-updater.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Fast parallel feed updater for the Nextcloud news app";
-    homepage = https://github.com/nextcloud/news-updater;
+    homepage = "https://github.com/nextcloud/news-updater";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ schneefux ];
   };
diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix
index 10a0c99996d7..e9bd705ffa9f 100644
--- a/nixpkgs/pkgs/servers/nginx-sso/default.nix
+++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "nginx-sso";
-  version = "0.24.0";
+  version = "0.24.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/Luzifer/nginx-sso";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "Luzifer";
     repo = "nginx-sso";
-    sha256 = "0jkmd1hdr40i1wd3001ixjv1nminsxmwhvnhcgfqcdn5gnaradwn";
+    sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx";
   };
 
   postInstall = ''
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "SSO authentication provider for the auth_request nginx module";
-    homepage = https://github.com/Luzifer/nginx-sso;
+    homepage = "https://github.com/Luzifer/nginx-sso";
     license = licenses.asl20;
     maintainers = with maintainers; [ delroth ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
index b7b43edc1cd9..73a07ec057eb 100644
--- a/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Flash-optimized, in-memory, NoSQL database";
-    homepage = http://aerospike.com/;
+    homepage = "http://aerospike.com/";
     license = licenses.agpl3;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kalbasit ];
diff --git a/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix
index f3d5d121c387..bd7f9a36c9c6 100644
--- a/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://jena.apache.org;
+    homepage = "http://jena.apache.org";
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     updateWalker = true;
     downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
diff --git a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 05153a7f8594..135fd31ea3d2 100644
--- a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.asl20;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://jena.apache.org;
+    homepage = "http://jena.apache.org";
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
   };
diff --git a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
index e41930a2f485..54d5e8484bcb 100644
--- a/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/arangodb/default.nix
@@ -45,7 +45,7 @@ let
     enableParallelBuilding = true;
 
     meta = with lib; {
-      homepage = https://www.arangodb.com;
+      homepage = "https://www.arangodb.com";
       description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
       license = licenses.asl20;
       platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
index fd0a97d029d5..6ccd2e1c8ddf 100644
--- a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
+++ b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://cassandra.apache.org/;
+    homepage = "http://cassandra.apache.org/";
     description = "A massively scalable open source NoSQL database";
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
index 3669df47ee2a..aa04bcaed9f8 100644
--- a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix
@@ -1,30 +1,26 @@
-{ lib, buildGoPackage, fetchFromGitHub, }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "influxdb";
-  version = "1.7.6";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q";
+    sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq";
   };
 
-  buildFlagsArray = [ ''-ldflags=
-    -X main.version=${version}
-  '' ];
+  modSha256 = "07v4ijblvl2zq049fdz5vdfhk6d3phrsajhnhwl46x02dbdzgj13";
 
-  goPackagePath = "github.com/influxdata/influxdb";
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   excludedPackages = "test";
 
-  goDeps = ./deps.nix;
-
   meta = with lib; {
     description = "An open-source distributed time series database";
     license = licenses.mit;
-    homepage = https://influxdata.com/;
+    homepage = "https://influxdata.com/";
     maintainers = with maintainers; [ offline zimbatm ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix b/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix
deleted file mode 100644
index 5492ad9d8eaa..000000000000
--- a/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix
+++ /dev/null
@@ -1,804 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "collectd.org";
-    fetch = {
-      type = "git";
-      url = "https://github.com/collectd/go-collectd";
-      rev =  "2ce144541b8903101fb8f1483cc0497a68798122";
-      sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev =  "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
-      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Masterminds/semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Masterminds/semver";
-      rev =  "c7af12943936e8c39859482e61f0574c2fd7fc75";
-      sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/alecthomas/kingpin";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/kingpin";
-      rev =  "947dcec5ba9c011838740e680966fd7087a71d0d";
-      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/alecthomas/template";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/template";
-      rev =  "a0175ee3bccc567396460bf5acd36800cb10c49c";
-      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/alecthomas/units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/units";
-      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
-      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/apache/arrow";
-    fetch = {
-      type = "git";
-      url = "https://github.com/apache/arrow";
-      rev =  "f5df77359953ed06e1dce47edffc03340e2ff3ea";
-      sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/apex/log";
-    fetch = {
-      type = "git";
-      url = "https://github.com/apex/log";
-      rev =  "941dea75d3ebfbdd905a5d8b7b232965c5e5c684";
-      sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev =  "dd947f47decb37a7c3bee72501bfc790701ab5ad";
-      sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d";
-    };
-  }
-  {
-    goPackagePath  = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev =  "3a771d992973f24aa725d07868b467d1ddfceafb";
-      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/blakesmith/ar";
-    fetch = {
-      type = "git";
-      url = "https://github.com/blakesmith/ar";
-      rev =  "8bd4349a67f2533b078dbc524689d15dba0f4659";
-      sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j";
-    };
-  }
-  {
-    goPackagePath  = "github.com/bmizerany/pat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bmizerany/pat";
-      rev =  "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
-      sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/boltdb/bolt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/boltdb/bolt";
-      rev =  "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
-      sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/c-bata/go-prompt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/c-bata/go-prompt";
-      rev =  "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
-      sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/caarlos0/ctrlc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/caarlos0/ctrlc";
-      rev =  "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4";
-      sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j";
-    };
-  }
-  {
-    goPackagePath  = "github.com/campoy/unique";
-    fetch = {
-      type = "git";
-      url = "https://github.com/campoy/unique";
-      rev =  "88950e537e7e644cd746a3102037b5d2b723e9f5";
-      sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cespare/xxhash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cespare/xxhash";
-      rev =  "5c37fe3735342a2e0d01c87a907579987c8936cc";
-      sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dgrijalva/jwt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgrijalva/jwt-go";
-      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
-      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dgryski/go-bitstream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgryski/go-bitstream";
-      rev =  "3522498ce2c8ea06df73e55df58edfbfb33cfdd6";
-      sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev =  "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
-      sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/glycerine/go-unsnap-stream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/glycerine/go-unsnap-stream";
-      rev =  "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
-      sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-ini/ini";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ini/ini";
-      rev =  "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737";
-      sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb";
-    };
-  }
-  {
-    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/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev =  "636bf0302bc95575d69441b25a2603156ffdddf1";
-      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
-      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev =  "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
-      sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-cmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-cmp";
-      rev =  "3af367b6b30c263d47e8895973edcca9a49cf029";
-      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-github";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-github";
-      rev =  "dd29b543e14c33e6373773f2c5ea008b29aeac95";
-      sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-querystring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-querystring";
-      rev =  "44c6ddd0a2342c386950e880b658017258da92fc";
-      sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/goreleaser/goreleaser";
-    fetch = {
-      type = "git";
-      url = "https://github.com/goreleaser/goreleaser";
-      rev =  "f99940ff5397b099bf606cf1323c00c63afcd153";
-      sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739";
-    };
-  }
-  {
-    goPackagePath  = "github.com/goreleaser/nfpm";
-    fetch = {
-      type = "git";
-      url = "https://github.com/goreleaser/nfpm";
-      rev =  "de75d679901371e3ed0c0a606e160539d5a4b45e";
-      sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/imdario/mergo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/imdario/mergo";
-      rev =  "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4";
-      sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/flux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/flux";
-      rev =  "bcfc535fb7443776501797df4ba596483c50c7fe";
-      sha256 = "0w87dqphaca49hb9wdrs35plvhcpgfmfwd5k00vbkwwmyil7majf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/influxql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/influxql";
-      rev =  "1cbfca8e56b6eaa120f5b5161e4f0d5edcc9e513";
-      sha256 = "0hfjr5yg6cbvlv96l4riw6bv5gdv7y1sfymm7awix1ab6xdmv3lm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/line-protocol";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/line-protocol";
-      rev =  "a3afd890113fb9f0337e05808bb06fb0ca4c685a";
-      sha256 = "1nspgpm8na2agkmzd4fhn7g8sqyn77mj6hzx1l27zbwf8ask266h";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/roaring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/roaring";
-      rev =  "fc520f41fab6dcece280e8d4853d87a09a67f9e0";
-      sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/tdigest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/tdigest";
-      rev =  "bf2b5ad3c0a925c44a0d2842c5d8182113cd248e";
-      sha256 = "0cf0hcm4g052qzq4n67vxl5qh7lvp13x23hndzwmazxzdaar8gh1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/usage-client";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/usage-client";
-      rev =  "6d3895376368aa52a3a81d2a16e90f0f52371967";
-      sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jmespath/go-jmespath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jmespath/go-jmespath";
-      rev =  "0b12d6b5";
-      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jsternberg/zap-logfmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jsternberg/zap-logfmt";
-      rev =  "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
-      sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jwilder/encoding";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jwilder/encoding";
-      rev =  "b4e1701a28efcc637d9afcca7d38e495fe909a09";
-      sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kisielk/gotool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kisielk/gotool";
-      rev =  "80517062f582ea3340cd4baf70e86d539ae7d84d";
-      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/klauspost/compress";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/compress";
-      rev =  "b939724e787a27c0005cabe3f78e7ed7987ac74f";
-      sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
-    };
-  }
-  {
-    goPackagePath  = "github.com/klauspost/cpuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/cpuid";
-      rev =  "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
-      sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/klauspost/crc32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/crc32";
-      rev =  "cb6bfca970f6908083f26f39a79009d608efd5cd";
-      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/klauspost/pgzip";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/pgzip";
-      rev =  "0bf5dcad4ada2814c3c00f996a982270bb81a506";
-      sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
-    };
-  }
-  {
-    goPackagePath  = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev =  "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
-      sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
-    };
-  }
-  {
-    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 =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
-      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev =  "9e777a8366cce605130a531d2cd6363d07ad7317";
-      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-tty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-tty";
-      rev =  "13ff1204f104d52c3f7645ec027ecbcf9026429e";
-      sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-zglob";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-zglob";
-      rev =  "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
-      sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev =  "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev =  "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
-      sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mschoch/smat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mschoch/smat";
-      rev =  "90eadee771aeab36e8bf796039b8c261bebebe4f";
-      sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opentracing/opentracing-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing/opentracing-go";
-      rev =  "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d";
-      sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g";
-    };
-  }
-  {
-    goPackagePath  = "github.com/paulbellamy/ratecounter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/paulbellamy/ratecounter";
-      rev =  "524851a93235ac051e3540563ed7909357fe24ab";
-      sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/peterh/liner";
-    fetch = {
-      type = "git";
-      url = "https://github.com/peterh/liner";
-      rev =  "8c1271fcf47f341a9e6771872262870e1ad7650c";
-      sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/philhofer/fwd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/philhofer/fwd";
-      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
-      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/term";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/term";
-      rev =  "bffc007b7fd5a70e20e28f5b7649bb84671ef436";
-      sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev =  "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
-      sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev =  "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
-      sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev =  "7600349dcfe1abd18d72d3a1770870d9800a7801";
-      sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev =  "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
-      sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/retailnext/hllpp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/retailnext/hllpp";
-      rev =  "101a6d2f8b52abfc409ac188958e7e7be0116331";
-      sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev =  "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
-      sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/segmentio/kafka-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/segmentio/kafka-go";
-      rev =  "0b3aacc527812d4040e51211146a43545e82d670";
-      sha256 = "05qz309l8chs9p2f1vqapgc4k459wflhhlc7p18ij5kz7qhx2mjl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/cast";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cast";
-      rev =  "8c9545af88b134710ab1cd196795e7f2388358d7";
-      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tinylib/msgp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tinylib/msgp";
-      rev =  "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
-      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
-    };
-  }
-  {
-    goPackagePath  = "github.com/willf/bitset";
-    fetch = {
-      type = "git";
-      url = "https://github.com/willf/bitset";
-      rev =  "d860f346b89450988a379d7d705e83c58d1ea227";
-      sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/xlab/treeprint";
-    fetch = {
-      type = "git";
-      url = "https://github.com/xlab/treeprint";
-      rev =  "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2";
-      sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n";
-    };
-  }
-  {
-    goPackagePath  = "go.uber.org/atomic";
-    fetch = {
-      type = "git";
-      url = "https://github.com/uber-go/atomic";
-      rev =  "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289";
-      sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
-    };
-  }
-  {
-    goPackagePath  = "go.uber.org/multierr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/uber-go/multierr";
-      rev =  "3c4937480c32f4c13a875a1829af76c98ca3d40a";
-      sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
-    };
-  }
-  {
-    goPackagePath  = "go.uber.org/zap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/uber-go/zap";
-      rev =  "4d45f9617f7d90f7a663ff21c7a4321dbe78098b";
-      sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
-      sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
-      sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev =  "c57b0facaced709681d9f90397429b9430a74754";
-      sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev =  "1d60e4601c6fd243af51cc01ddf169918a5407ca";
-      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
-      sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/time";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/time";
-      rev =  "fbb02b2291d28baffd63558aa44b4b56f178d650";
-      sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev =  "45ff765b4815d34d8b80220fd05c79063b185ce1";
-      sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
-      sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/genproto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev =  "fedd2861243fd1a8152376292b921b394c7bef7e";
-      sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/grpc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc/grpc-go";
-      rev =  "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
-      sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
-    };
-  }
-  {
-    goPackagePath  = "honnef.co/go/tools";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dominikh/go-tools";
-      rev =  "d73ab98e7c39fdcf9ba65062e43d34310f198353";
-      sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
-    };
-  }
-]
\ No newline at end of file
diff --git a/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
index b4b6334c13f5..e3d277ba5afb 100644
--- a/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ scons ];
+  nativeBuildInputs = [ scons.py2 ];
   buildInputs = [
     boost
     curl
diff --git a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
index 98dd604c76dd..743553f5f616 100644
--- a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A highly scalable, robust (fully ACID) native graph database";
-    homepage = http://www.neo4j.org/;
+    homepage = "http://www.neo4j.org/";
     license = licenses.gpl3;
 
     maintainers = [ maintainers.offline ];
diff --git a/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix b/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix
index 63c1b3b5fd77..46a23ed2529f 100644
--- a/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/rethinkdb/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       query language that supports really useful queries like table
       joins and group by, and is easy to setup and learn.
     '';
-    homepage    = http://www.rethinkdb.com;
+    homepage    = "http://www.rethinkdb.com";
     license     = stdenv.lib.licenses.agpl3;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ];
diff --git a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix
index f85c4aebd512..eb956b130edf 100644
--- a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "VictoriaMetrics";
-  version = "1.33.1";
+  version = "1.34.7";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1irc3zahp72631ai9rafc8n7vayr4hzlh8qla05chlsb2fwzqrrd";
+    sha256 = "0k4l3nq1d6f5qjx8svgga0ygv9mmhykvs3n3xr824ih6d0vrkzbg";
   };
 
-  modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk";
+  goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://victoriametrics.com/";
     description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix
index d094fda84b4f..d0a571988202 100644
--- a/nixpkgs/pkgs/servers/oauth2_proxy/default.nix
+++ b/nixpkgs/pkgs/servers/oauth2_proxy/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
 
   meta = with lib; {
     description = "A reverse proxy that provides authentication with Google, Github or other provider";
-    homepage = https://github.com/pusher/oauth2_proxy/;
+    homepage = "https://github.com/pusher/oauth2_proxy/";
     license = licenses.mit;
     maintainers = [ maintainers.yorickvp ];
   };
diff --git a/nixpkgs/pkgs/servers/openafs/1.6/default.nix b/nixpkgs/pkgs/servers/openafs/1.6/default.nix
index a1e56ca161ed..4dcc7b5e05de 100644
--- a/nixpkgs/pkgs/servers/openafs/1.6/default.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.6/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     outputsToInstall = [ "out" "doc" "man" ];
     description = "Open AFS client";
-    homepage = https://www.openafs.org;
+    homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
diff --git a/nixpkgs/pkgs/servers/openafs/1.6/module.nix b/nixpkgs/pkgs/servers/openafs/1.6/module.nix
index 0d61b1cd1041..f1acdfcce5a4 100644
--- a/nixpkgs/pkgs/servers/openafs/1.6/module.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.6/module.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Open AFS client kernel module";
-    homepage = https://www.openafs.org;
+    homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
diff --git a/nixpkgs/pkgs/servers/openafs/1.8/default.nix b/nixpkgs/pkgs/servers/openafs/1.8/default.nix
index 5fe4cad021f1..07f5560ff20a 100644
--- a/nixpkgs/pkgs/servers/openafs/1.8/default.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.8/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     outputsToInstall = [ "out" "doc" "man" ];
     description = "Open AFS client";
-    homepage = https://www.openafs.org;
+    homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
diff --git a/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/nixpkgs/pkgs/servers/openafs/1.8/module.nix
index dab97f10bee3..4aecc851b860 100644
--- a/nixpkgs/pkgs/servers/openafs/1.8/module.nix
+++ b/nixpkgs/pkgs/servers/openafs/1.8/module.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Open AFS client kernel module";
-    homepage = https://www.openafs.org;
+    homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.maggesi maintainers.spacefrogg ];
diff --git a/nixpkgs/pkgs/servers/openxpki/default.nix b/nixpkgs/pkgs/servers/openxpki/default.nix
index 7bd0ee2eede1..9b952938e893 100644
--- a/nixpkgs/pkgs/servers/openxpki/default.nix
+++ b/nixpkgs/pkgs/servers/openxpki/default.nix
@@ -73,7 +73,7 @@ perlPackages.buildPerlPackage {
   doCheck = false;
 
   meta = {
-    homepage = http://www.openxpki.org;
+    homepage = "http://www.openxpki.org";
     description = "Enterprise-grade PKI/Trustcenter software";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
diff --git a/nixpkgs/pkgs/servers/osrm-backend/default.nix b/nixpkgs/pkgs/servers/osrm-backend/default.nix
index b744c58d4fb1..fe3e3c06285b 100644
--- a/nixpkgs/pkgs/servers/osrm-backend/default.nix
+++ b/nixpkgs/pkgs/servers/osrm-backend/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
 
   meta = {
-    homepage = https://github.com/Project-OSRM/osrm-backend/wiki;
+    homepage = "https://github.com/Project-OSRM/osrm-backend/wiki";
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers;[ erictapen ];
diff --git a/nixpkgs/pkgs/servers/p910nd/default.nix b/nixpkgs/pkgs/servers/p910nd/default.nix
index 67e125d7a8cc..f209a2d2aa6e 100644
--- a/nixpkgs/pkgs/servers/p910nd/default.nix
+++ b/nixpkgs/pkgs/servers/p910nd/default.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
       the AppSocket protocol and has the scheme socket://. LPRng also supports
       this protocol and the syntax is lp=remotehost%9100 in /etc/printcap.
     '';
-    homepage = http://p910nd.sourceforge.net/;
-    downloadPage = https://sourceforge.net/projects/p910nd/;
+    homepage = "http://p910nd.sourceforge.net/";
+    downloadPage = "https://sourceforge.net/projects/p910nd/";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/pies/default.nix b/nixpkgs/pkgs/servers/pies/default.nix
index a113d583cb1a..201ff3296fa5 100644
--- a/nixpkgs/pkgs/servers/pies/default.nix
+++ b/nixpkgs/pkgs/servers/pies/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = https://www.gnu.org/software/pies/;
+    homepage = "https://www.gnu.org/software/pies/";
 
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
diff --git a/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix
index d4dd993b3296..ea01919ce208 100644
--- a/nixpkgs/pkgs/servers/plex/raw.nix
+++ b/nixpkgs/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.18.8.2527-740d4c206";
+  version = "1.19.1.2645-ccb6eb67e";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "05543nkhmp6wq88vz5cnv3cfd5hbd8rqs1rylfy7njgvb0pxl107";
+    sha256 = "0ivv6apavkgy4zryhwam20jjfgy8sxpccqp0bi5ylh33jpxhm096";
   };
 
   outputs = [ "out" "basedb" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   dontAutoPatchelf = true;
 
   meta = with stdenv.lib; {
-    homepage = https://plex.tv/;
+    homepage = "https://plex.tv/";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [
diff --git a/nixpkgs/pkgs/servers/polipo/default.nix b/nixpkgs/pkgs/servers/polipo/default.nix
index a6b65cde89f9..444705d85d01 100644
--- a/nixpkgs/pkgs/servers/polipo/default.nix
+++ b/nixpkgs/pkgs/servers/polipo/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" "LOCAL_ROOT=$(out)/share/polipo/www" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.pps.jussieu.fr/~jch/software/polipo/;
+    homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/";
     description = "A small and fast caching web proxy";
     license = licenses.mit;
     maintainers = with maintainers; [ phreedom ehmry ];
diff --git a/nixpkgs/pkgs/servers/pounce/default.nix b/nixpkgs/pkgs/servers/pounce/default.nix
index 8fb71f72721d..8609648378a7 100644
--- a/nixpkgs/pkgs/servers/pounce/default.nix
+++ b/nixpkgs/pkgs/servers/pounce/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://code.causal.agency/june/pounce;
+    homepage = "https://code.causal.agency/june/pounce";
     description = "Simple multi-client TLS-only IRC bouncer";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/prayer/default.nix b/nixpkgs/pkgs/servers/prayer/default.nix
index 95fbe446bb24..8bc40cb73cc9 100644
--- a/nixpkgs/pkgs/servers/prayer/default.nix
+++ b/nixpkgs/pkgs/servers/prayer/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lpam";
 
   meta = {
-    homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/;
+    homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/";
     description = "Yet another Webmail interface for IMAP servers on Unix systems written in C";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/nixpkgs/pkgs/servers/ps3netsrv/default.nix
index 7e6b92a03764..2288942ebf30 100644
--- a/nixpkgs/pkgs/servers/ps3netsrv/default.nix
+++ b/nixpkgs/pkgs/servers/ps3netsrv/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "C++ implementation of the ps3netsrv server";
-    homepage = https://github.com/dirkvdb/ps3netsrv--;
+    homepage = "https://github.com/dirkvdb/ps3netsrv--";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
diff --git a/nixpkgs/pkgs/servers/pulseaudio/default.nix b/nixpkgs/pkgs/servers/pulseaudio/default.nix
index 49909510d2ed..b9fb104d5f6c 100644
--- a/nixpkgs/pkgs/servers/pulseaudio/default.nix
+++ b/nixpkgs/pkgs/servers/pulseaudio/default.nix
@@ -17,7 +17,7 @@
 
 , airtunesSupport ? false
 
-, bluetoothSupport ? false
+, bluetoothSupport ? true
 
 , remoteControlSupport ? false
 
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Sound server for POSIX and Win32 systems";
-    homepage    = http://www.pulseaudio.org/;
+    homepage    = "http://www.pulseaudio.org/";
     license     = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ lovek323 ];
     platforms   = lib.platforms.unix;
diff --git a/nixpkgs/pkgs/servers/pulseaudio/qpaeq.nix b/nixpkgs/pkgs/servers/pulseaudio/qpaeq.nix
index c84cc29f6528..1f50022a9181 100644
--- a/nixpkgs/pkgs/servers/pulseaudio/qpaeq.nix
+++ b/nixpkgs/pkgs/servers/pulseaudio/qpaeq.nix
@@ -13,7 +13,7 @@ let
     icon = "audio-volume-high";
     desktopName = "qpaeq";
     genericName = "Audio equalizer";
-    categories = "Music;Sound;";
+    categories = "AudioVideo;Audio;Mixer;";
     startupNotify = "false";
   };
 in
@@ -46,7 +46,7 @@ mkDerivation rec {
 
   meta = {
     description = "An equalizer interface for pulseaudio's equalizer sinks";
-    homepage = http://www.pulseaudio.org/;
+    homepage = "http://www.pulseaudio.org/";
     license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ lovek323 mkg20001 ];
     platforms = lib.platforms.unix;
diff --git a/nixpkgs/pkgs/servers/quagga/default.nix b/nixpkgs/pkgs/servers/quagga/default.nix
index bd679fd3ff82..5bff70878d3b 100644
--- a/nixpkgs/pkgs/servers/quagga/default.nix
+++ b/nixpkgs/pkgs/servers/quagga/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       It is more than a routed replacement, it can be used as a Route Server and
       a Route Reflector.
     '';
-    homepage = https://www.nongnu.org/quagga/;
+    homepage = "https://www.nongnu.org/quagga/";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ tavyc ];
diff --git a/nixpkgs/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix
index 83fa2506800f..96c94c2bc6b2 100644
--- a/nixpkgs/pkgs/servers/radicale/1.x.nix
+++ b/nixpkgs/pkgs/servers/radicale/1.x.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = !pythonPackages.isPy3k;
 
   meta = with stdenv.lib; {
-    homepage = http://www.radicale.org/;
+    homepage = "http://www.radicale.org/";
     description = "CalDAV CardDAV server";
     longDescription = ''
       The Radicale Project is a complete CalDAV (calendar) and CardDAV
diff --git a/nixpkgs/pkgs/servers/radicale/default.nix b/nixpkgs/pkgs/servers/radicale/default.nix
index da55131773be..fc98795bbc79 100644
--- a/nixpkgs/pkgs/servers/radicale/default.nix
+++ b/nixpkgs/pkgs/servers/radicale/default.nix
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.radicale.org/;
+    homepage = "https://www.radicale.org/";
     description = "CalDAV CardDAV server";
     longDescription = ''
       The Radicale Project is a complete CalDAV (calendar) and CardDAV
diff --git a/nixpkgs/pkgs/servers/rainloop/default.nix b/nixpkgs/pkgs/servers/rainloop/default.nix
index 6d5016961e98..bff5d2ea3062 100644
--- a/nixpkgs/pkgs/servers/rainloop/default.nix
+++ b/nixpkgs/pkgs/servers/rainloop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let
+{ stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let
   common = { edition, sha256 }:
     stdenv.mkDerivation (rec {
       pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}";
@@ -16,11 +16,23 @@
         sha256 = sha256;
       };
 
+      includeScript = pkgs.writeText "include.php" ''
+        <?php
+
+        /**
+         * @return string
+         */
+        function __get_custom_data_full_path()
+        {
+          return '${dataPath}'; // custom data folder path
+        }
+      '';
+
       installPhase = ''
         mkdir $out
         cp -r rainloop/* $out
         rm -rf $out/data
-        ln -s ${dataPath} $out/data
+        cp ${includeScript} $out/include.php
       '';
 
       meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/servers/rippled/data-api.nix b/nixpkgs/pkgs/servers/rippled/data-api.nix
index 04d520b412c1..2d1db24474bb 100644
--- a/nixpkgs/pkgs/servers/rippled/data-api.nix
+++ b/nixpkgs/pkgs/servers/rippled/data-api.nix
@@ -10,7 +10,7 @@ in nodePackages.buildNodePackage rec {
   rev = "c56b860105f36c1c44ae011189d495272648c589";
 
   src = fetchgit {
-    url = https://github.com/ripple/ripple-data-api.git;
+    url = "https://github.com/ripple/ripple-data-api.git";
     inherit rev;
     sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m";
   };
@@ -19,7 +19,7 @@ in nodePackages.buildNodePackage rec {
 
   meta = {
     description = "Historical ripple data";
-    homepage = https://github.com/ripple/ripple-data-api;
+    homepage = "https://github.com/ripple/ripple-data-api";
     maintainers = with maintainers; [ offline ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix
index 905e776ea362..69a54a1202d2 100644
--- a/nixpkgs/pkgs/servers/rippled/default.nix
+++ b/nixpkgs/pkgs/servers/rippled/default.nix
@@ -149,7 +149,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ripple P2P payment network reference server";
-    homepage = https://github.com/ripple/rippled;
+    homepage = "https://github.com/ripple/rippled";
     maintainers = with maintainers; [ ehmry offline ];
     license = licenses.isc;
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix
index 684e070292c7..ec5794d1509c 100644
--- a/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix
+++ b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Generate master and ephemeral rippled validator keys";
-    homepage = https://github.com/ripple/validator-keys-tool;
+    homepage = "https://github.com/ripple/validator-keys-tool";
     maintainers = with maintainers; [ offline ];
     license = licenses.isc;
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/servers/roon-server/default.nix b/nixpkgs/pkgs/servers/roon-server/default.nix
index 64b212eb49fb..49eaa26c2947 100644
--- a/nixpkgs/pkgs/servers/roon-server/default.nix
+++ b/nixpkgs/pkgs/servers/roon-server/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The music player for music lovers.";
-    homepage    = https://roonlabs.com;
+    homepage    = "https://roonlabs.com";
     license     = licenses.unfree;
     maintainers = with maintainers; [ steell ];
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/rpcbind/default.nix b/nixpkgs/pkgs/servers/rpcbind/default.nix
index 00d01b01efee..52197a6afaac 100644
--- a/nixpkgs/pkgs/servers/rpcbind/default.nix
+++ b/nixpkgs/pkgs/servers/rpcbind/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     description = "ONC RPC portmapper";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    homepage = https://linux-nfs.org/;
+    homepage = "https://linux-nfs.org/";
     maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
diff --git a/nixpkgs/pkgs/servers/sabnzbd/default.nix b/nixpkgs/pkgs/servers/sabnzbd/default.nix
index 57c774ebcb05..54d327d5fc42 100644
--- a/nixpkgs/pkgs/servers/sabnzbd/default.nix
+++ b/nixpkgs/pkgs/servers/sabnzbd/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Usenet NZB downloader, par2 repairer and auto extracting server";
-    homepage = https://sabnzbd.org;
+    homepage = "https://sabnzbd.org";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fridh ];
diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix
index d24a9b9748aa..1d6951bb8c1c 100644
--- a/nixpkgs/pkgs/servers/samba/4.x.nix
+++ b/nixpkgs/pkgs/servers/samba/4.x.nix
@@ -1,22 +1,44 @@
-{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
+{ stdenv
+, fetchurl
+, python
+, pkgconfig
+, bison
+, flex
+, perl
+, libxslt
+, docbook_xsl
+, rpcgen
 , fixDarwinDylibNames
-, docbook_xml_dtd_42, readline
-, popt, iniparser, libbsd, libarchive, libiconv, gettext
-, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs
-, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid
+, docbook_xml_dtd_45
+, readline
+, popt
+, libbsd
+, libarchive
+, zlib
+, liburing
+, fam
+, gnutls
+, libunwind
+, systemd
+, jansson
+, libtasn1
+, tdb
+, cmocka
 
-, enableLDAP ? false
-, enablePrinting ? false
-, enableMDNS ? false
-, enableDomainController ? false
-, enableRegedit ? true
-, enableCephFS ? false
-, enableGlusterFS ? false
-, enableAcl ? (!stdenv.isDarwin)
-, enablePam ? (!stdenv.isDarwin)
+, enableLDAP ? false, openldap
+, enablePrinting ? false, cups
+, enableProfiling ? true
+, enableMDNS ? false, avahi
+, enableDomainController ? false, gpgme, lmdb
+, enableKerberos ? true, krb5Full
+, enableRegedit ? true, ncurses
+, enableCephFS ? false, libceph
+, enableGlusterFS ? false, glusterfs, libuuid
+, enableAcl ? (!stdenv.isDarwin), acl
+, enablePam ? (!stdenv.isDarwin), pam
 }:
 
-with lib;
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
@@ -36,17 +58,40 @@ stdenv.mkDerivation rec {
     ./4.x-fix-makeflags-parsing.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ]
-  ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
+  nativeBuildInputs = [
+    pkgconfig
+    bison
+    flex
+    perl
+    perl.pkgs.ParseYapp
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_45
+    cmocka
+  ] ++ optionals stdenv.isDarwin [
+    rpcgen
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
-    python readline popt iniparser jansson
-    libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
-  ] ++ optionals stdenv.isLinux [ libaio liburing systemd ]
+    python
+    readline
+    popt
+    jansson
+    libbsd
+    libarchive
+    zlib
+    fam
+    libunwind
+    gnutls
+    libtasn1
+    tdb
+  ] ++ optionals stdenv.isLinux [ liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
     ++ optional enableMDNS avahi
     ++ optionals enableDomainController [ gpgme lmdb ]
+    ++ optional enableKerberos krb5Full
     ++ optional enableRegedit ncurses
     ++ optional (enableCephFS && stdenv.isLinux) libceph
     ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@@ -66,8 +111,6 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-static-modules=NONE"
     "--with-shared-modules=ALL"
-    "--with-system-mitkrb5"
-    "--with-system-mitkdc" krb5Full
     "--enable-fhs"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -75,7 +118,13 @@ stdenv.mkDerivation rec {
   ] ++ singleton (if enableDomainController
          then "--with-experimental-mit-ad-dc"
          else "--without-ad-dc")
-    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]
+    ++ optionals enableKerberos [
+    "--with-system-mitkrb5"
+    "--with-system-mitkdc=${krb5Full}"
+  ] ++ optionals (!enableLDAP) [
+    "--without-ldap"
+    "--without-ads"
+  ] ++ optional enableProfiling "--with-profiling-data"
     ++ optional (!enableAcl) "--without-acl-support"
     ++ optional (!enablePam) "--without-pam";
 
diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
index ad3654f17dfb..8e086ac5e66b 100644
--- a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix
@@ -41,7 +41,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with stdenv.lib; {
-      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu;
+      homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu";
       description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch";
       license = licenses.asl20;
     };
@@ -58,7 +58,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen;
+      homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen";
       description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter";
       license = licenses.asl20;
     };
@@ -75,7 +75,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2;
+      homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2";
       description = "The EC2 discovery plugin uses the AWS API for unicast discovery.";
       license = licenses.asl20;
     };
@@ -92,7 +92,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment;
+      homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment";
       description = "Ingest processor that uses Apache Tika to extract contents";
       license = licenses.asl20;
     };
@@ -109,7 +109,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3;
+      homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3";
       description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore.";
       license = licenses.asl20;
     };
@@ -126,7 +126,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs;
+      homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs";
       description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore.";
       license = licenses.asl20;
     };
@@ -149,7 +149,7 @@ in {
         else throw "unsupported version ${version} for plugin ${pluginName}";
     };
     meta = with lib; {
-      homepage = https://search-guard.com;
+      homepage = "https://search-guard.com";
       description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
       license = licenses.asl20;
     };
diff --git a/nixpkgs/pkgs/servers/search/groonga/default.nix b/nixpkgs/pkgs/servers/search/groonga/default.nix
index 57f3b2e0f1b5..40d59611da2a 100644
--- a/nixpkgs/pkgs/servers/search/groonga/default.nix
+++ b/nixpkgs/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "groonga";
-  version = "9.1.2";
+  version = "10.0.0";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
-    sha256 = "0zj9zribkg4x6c6175pwl4i6jpxg045bca1ywfrfcdsxkjllvk7g";
+    sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr";
   };
 
   buildInputs = with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   installCheckPhase = "$out/bin/groonga --version";
 
   meta = with stdenv.lib; {
-    homepage    = https://groonga.org/;
+    homepage    = "https://groonga.org/";
     description = "An open-source fulltext search engine and column store";
     license     = licenses.lgpl21;
     maintainers = [ maintainers.ericsagnes ];
diff --git a/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/nixpkgs/pkgs/servers/search/meilisearch/default.nix
new file mode 100644
index 000000000000..f2484dffa636
--- /dev/null
+++ b/nixpkgs/pkgs/servers/search/meilisearch/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, IOKit
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "meilisearch";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "meilisearch";
+    repo = "MeiliSearch";
+    rev = "v${version}";
+    sha256 = "00i5vsbcyrbsvhr5n1b3pxa87v0kfw6pg931i2kzyf4wh021k6sw";
+  };
+
+  cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz";
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ];
+
+  meta = with stdenv.lib; {
+    description = "Ultra relevant and instant full-text search API";
+    homepage = "https://meilisearch.com/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ filalex77 ];
+  };
+}
diff --git a/nixpkgs/pkgs/servers/search/solr/default.nix b/nixpkgs/pkgs/servers/search/solr/default.nix
index 701d3880cbd0..0da61861207c 100644
--- a/nixpkgs/pkgs/servers/search/solr/default.nix
+++ b/nixpkgs/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.4.1";
+  version = "8.5.0";
 
   src = fetchurl {
     url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
+    sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
index 5c29d8b47808..47547f07fb49 100644
--- a/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
+++ b/nixpkgs/pkgs/servers/search/sphinxsearch/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An open source full text search server";
-    homepage    = http://sphinxsearch.com;
+    homepage    = "http://sphinxsearch.com";
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;
     maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ];
diff --git a/nixpkgs/pkgs/servers/serf/default.nix b/nixpkgs/pkgs/servers/serf/default.nix
index 585fc2b73ef9..8129cb5ad8e3 100644
--- a/nixpkgs/pkgs/servers/serf/default.nix
+++ b/nixpkgs/pkgs/servers/serf/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Tool for service orchestration and management";
-    homepage = https://www.serf.io/;
+    homepage = "https://www.serf.io/";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ pradeepchhetri ];
diff --git a/nixpkgs/pkgs/servers/serviio/default.nix b/nixpkgs/pkgs/servers/serviio/default.nix
index 03d86c209f07..6b1fdd109903 100644
--- a/nixpkgs/pkgs/servers/serviio/default.nix
+++ b/nixpkgs/pkgs/servers/serviio/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://serviio.org;
+    homepage = "http://serviio.org";
     description = "UPnP Media Streaming Server";
     longDescription = ''
       Serviio is a free media server. It allows you to stream your media files (music, video or images)
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.thpham ];
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/nixpkgs/pkgs/servers/shellinabox/default.nix b/nixpkgs/pkgs/servers/shellinabox/default.nix
index fe1837e907a1..279cfa3300be 100644
--- a/nixpkgs/pkgs/servers/shellinabox/default.nix
+++ b/nixpkgs/pkgs/servers/shellinabox/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/shellinabox/shellinabox;
+    homepage = "https://github.com/shellinabox/shellinabox";
     description = "Web based AJAX terminal emulator";
     license = licenses.gpl2;
     maintainers = with maintainers; [ tomberek lihop ];
diff --git a/nixpkgs/pkgs/servers/shishi/default.nix b/nixpkgs/pkgs/servers/shishi/default.nix
index 060b58d18b1b..41543c325a63 100644
--- a/nixpkgs/pkgs/servers/shishi/default.nix
+++ b/nixpkgs/pkgs/servers/shishi/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage    = https://www.gnu.org/software/shishi/;
+    homepage    = "https://www.gnu.org/software/shishi/";
     description = "An implementation of the Kerberos 5 network security system";
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ bjg lovek323 ];
diff --git a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/nixpkgs/pkgs/servers/sickbeard/sickgear.nix
index 8df674111ad1..cd98af51e086 100644
--- a/nixpkgs/pkgs/servers/sickbeard/sickgear.nix
+++ b/nixpkgs/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.17";
+  version = "0.21.22";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "0hyrsxaill7x9g4bp6mri9i3ll75y7j1xxc226gw2c817zc6ayms";
+    sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx";
   };
 
   dontBuild = true;
diff --git a/nixpkgs/pkgs/servers/sickbeard/sickrage.nix b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix
index cbde11e3dc0c..9ff44fade822 100644
--- a/nixpkgs/pkgs/servers/sickbeard/sickrage.nix
+++ b/nixpkgs/pkgs/servers/sickbeard/sickrage.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2, makeWrapper }:
 
 python2.pkgs.buildPythonApplication rec {
-  name = "sickrage-${version}";
+  pname = "sickrage";
   version = "v2018.07.21-1";
 
   src = fetchFromGitHub {
@@ -28,7 +28,7 @@ python2.pkgs.buildPythonApplication rec {
     description = "Automatic Video Library Manager for TV Shows";
     longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic.";
     license     = licenses.gpl3;
-    homepage    = https://sickrage.github.io;
+    homepage    = "https://sickrage.github.io";
     maintainers = with maintainers; [ sterfield ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/silc-server/default.nix b/nixpkgs/pkgs/servers/silc-server/default.nix
index fdb1dcbd1cf6..084d60ba6a5b 100644
--- a/nixpkgs/pkgs/servers/silc-server/default.nix
+++ b/nixpkgs/pkgs/servers/silc-server/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://silcnet.org/;
+    homepage = "http://silcnet.org/";
     description = "Secure Internet Live Conferencing server";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
diff --git a/nixpkgs/pkgs/servers/simplehttp2server/default.nix b/nixpkgs/pkgs/servers/simplehttp2server/default.nix
index 3ac32509ba3b..58b04b316b34 100644
--- a/nixpkgs/pkgs/servers/simplehttp2server/default.nix
+++ b/nixpkgs/pkgs/servers/simplehttp2server/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
-     homepage = https://github.com/GoogleChromeLabs/simplehttp2server;
+     homepage = "https://github.com/GoogleChromeLabs/simplehttp2server";
      description = "HTTP/2 server for development purposes";
      license = licenses.asl20;
      maintainers = with maintainers; [ yrashk ];
diff --git a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix
index f6791d010883..04ad685403b7 100644
--- a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix
+++ b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
-    homepage = https://freeswitch.org/;
+    homepage = "https://freeswitch.org/";
     license = stdenv.lib.licenses.mpl11;
     maintainers = with stdenv.lib.maintainers; [ misuzu ];
     platforms = with stdenv.lib.platforms; unix;
diff --git a/nixpkgs/pkgs/servers/sip/sipwitch/default.nix b/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
index 1252153b79ac..33c888ba35ed 100644
--- a/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
+++ b/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Secure peer-to-peer VoIP server that uses the SIP protocol";
-    homepage = https://www.gnu.org/software/sipwitch/;
+    homepage = "https://www.gnu.org/software/sipwitch/";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/nixpkgs/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix
index d755f864d4e3..254825c862ef 100644
--- a/nixpkgs/pkgs/servers/slimserver/default.nix
+++ b/nixpkgs/pkgs/servers/slimserver/default.nix
@@ -93,7 +93,7 @@ perlPackages.buildPerlPackage rec {
   outputs = [ "out" ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/Logitech/slimserver;
+    homepage = "https://github.com/Logitech/slimserver";
     description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server";
     # the firmware is not under a free license!
     # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt
diff --git a/nixpkgs/pkgs/servers/smcroute/default.nix b/nixpkgs/pkgs/servers/smcroute/default.nix
index 730d1bbdddce..e725e6243f00 100644
--- a/nixpkgs/pkgs/servers/smcroute/default.nix
+++ b/nixpkgs/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 = "http://troglobit.com/smcroute.html";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ fpletz ];
     platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd);
diff --git a/nixpkgs/pkgs/servers/softether/4.25.nix b/nixpkgs/pkgs/servers/softether/4.25.nix
index 2b21bef7d6f6..65e21010e757 100644
--- a/nixpkgs/pkgs/servers/softether/4.25.nix
+++ b/nixpkgs/pkgs/servers/softether/4.25.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
-    homepage = https://www.softether.org/;
+    homepage = "https://www.softether.org/";
     license = licenses.gpl2;
     maintainers = [ maintainers.rick68 ];
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/servers/softether/4.29.nix b/nixpkgs/pkgs/servers/softether/4.29.nix
index 1d80752a41a5..b1ef8643aa36 100644
--- a/nixpkgs/pkgs/servers/softether/4.29.nix
+++ b/nixpkgs/pkgs/servers/softether/4.29.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
-    homepage = https://www.softether.org/;
+    homepage = "https://www.softether.org/";
     license = licenses.asl20;
     maintainers = [ maintainers.rick68 ];
     platforms = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/servers/sozu/default.nix b/nixpkgs/pkgs/servers/sozu/default.nix
new file mode 100644
index 000000000000..f7feda5e916c
--- /dev/null
+++ b/nixpkgs/pkgs/servers/sozu/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+    pname = "sozu";
+    version = "0.11.46";
+
+    src = fetchFromGitHub {
+        owner = "sozu-proxy";
+        repo = pname;
+        rev = version;
+        sha256 = "0anng5qvdx9plxs9qqr5wmjjz0gx5113jq28xwbxaaklvd4ni7cm";
+    };
+
+    cargoSha256 = "19c2s9h4jk9pff72wdqw384mvrf40d8x4sx7qysnpb4hayq2ijh3";
+
+    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 ];
+    };
+}
\ No newline at end of file
diff --git a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
index 6637a75ea2f7..8f3d2a7b2854 100644
--- a/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/cockroachdb/default.nix
@@ -57,7 +57,7 @@ buildGoPackage rec {
   outputs = [ "bin" "man" "out" ];
 
   meta = with stdenv.lib; {
-    homepage    = https://www.cockroachlabs.com;
+    homepage    = "https://www.cockroachlabs.com";
     description = "A scalable, survivable, strongly-consistent SQL database";
     license     = licenses.asl20;
     platforms   = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix
index 27ab7d444bf1..6f7f81f23780 100644
--- a/nixpkgs/pkgs/servers/sql/dolt/default.nix
+++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, lib, buildGoModule }:
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.15.0";
+    version = "0.15.2";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "1zn5ws6x42niwq9rscn63ddpp0558k0lgncmf01p243jlkdnfsg3";
+        sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-    modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a";
+    modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn";
 
-    buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-    meta = with stdenv.lib; {
+    meta = with lib; {
         description = "Relational database with version control and CLI a-la Git.";
         homepage = "https://github.com/liquidata-inc/dolt";
         license = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
index 2b287c8f6ffd..ea11faf1efcf 100644
--- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
+{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses
 , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
-, libaio, libevent, jemalloc, cracklib, systemd, perl
+, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl
+, bzip2, lz4, lzo, snappy, xz, zlib, zstd
 , fixDarwinDylibNames, cctools, CoreServices, less
 , numactl # NUMA Support
 , withStorageMroonga ? true, kytea, msgpack, zeromq
+, withStorageRocks ? true
+, withStorageToku ? true
 }:
 
 with stdenv.lib;
@@ -34,9 +37,11 @@ common = rec { # attributes common to both builds
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    ncurses openssl zlib pcre jemalloc libiconv curl
+    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 fixDarwinDylibNames cctools CoreServices ]
+    ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
+    ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];
 
   prePatch = ''
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -80,8 +85,6 @@ common = rec { # attributes common to both builds
     # to pass in java explicitly.
     "-DCONNECT_WITH_JDBC=OFF"
     "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
-  ] ++ optionals stdenv.hostPlatform.isMusl [
-    "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl
   ];
 
   postInstall = ''
@@ -99,8 +102,9 @@ common = rec { # attributes common to both builds
   passthru.mysqlVersion = "5.7";
 
   meta = {
+
     description = "An enhanced, drop-in replacement for MySQL";
-    homepage    = https://mariadb.org/;
+    homepage    = "https://mariadb.org/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = platforms.all;
@@ -138,11 +142,11 @@ server = stdenv.mkDerivation (common // {
 
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
+  nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
 
   buildInputs = common.buildInputs ++ [
-    xz lzo lz4 bzip2 snappy
-    libxml2 boost judy libevent cracklib
+    bzip2 lz4 lzo snappy xz zstd
+    libxml2 judy libevent cracklib
   ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
     ++ optionals withStorageMroonga [ kytea msgpack zeromq ]
     ++ optional stdenv.hostPlatform.isLinux linux-pam
@@ -166,10 +170,17 @@ server = stdenv.mkDerivation (common // {
   ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
     "-DWITH_NUMA=ON"
   ] ++ optional (!withStorageMroonga) [
-    "-DWITHOUT_MROONGA=ON"
-  ] ++ optionals stdenv.hostPlatform.isDarwin [
-    "-DWITHOUT_OQGRAPH=1"
+    "-DWITHOUT_MROONGA=1"
+  ] ++ optional (!withStorageRocks) [
+    "-DWITHOUT_ROCKSDB=1"
+  ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
+    "-DWITH_ROCKSDB_JEMALLOC=ON"
+  ] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [
     "-DWITHOUT_TOKUDB=1"
+  ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [
+    "-DWITH_JEMALLOC=static"
+  ] ++ optional stdenv.hostPlatform.isDarwin [
+    "-DWITHOUT_OQGRAPH=1"
   ];
 
   preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) ''
diff --git a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix
index 73d37ba11a22..a6ce8f4b0471 100644
--- a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix
+++ b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Galera 3 wsrep provider library";
-    homepage = https://galeracluster.com/;
+    homepage = "https://galeracluster.com/";
     license = licenses.lgpl2;
     maintainers = with maintainers; [ izorkin ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
index 062de0c2368c..b14b3d9f6ad4 100644
--- a/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
+++ b/nixpkgs/pkgs/servers/sql/oracle-xe/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Oracle Database Express Edition";
-    homepage = http://www.oracle.com/technetwork/products/express-edition/;
+    homepage = "http://www.oracle.com/technetwork/products/express-edition/";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
index 860c1f8e94f7..43c1de7ea849 100644
--- a/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
+++ b/nixpkgs/pkgs/servers/sql/percona/5.6.x.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   passthru.mysqlVersion = "5.6";
 
   meta = with stdenv.lib; {
-    homepage = https://www.percona.com;
+    homepage = "https://www.percona.com";
     description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/nixpkgs/pkgs/servers/sql/pgpool/default.nix
index 32c30836f6dc..7c2f3521a085 100644
--- a/nixpkgs/pkgs/servers/sql/pgpool/default.nix
+++ b/nixpkgs/pkgs/servers/sql/pgpool/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://pgpool.net/mediawiki/index.php;
+    homepage = "http://pgpool.net/mediawiki/index.php";
     description = "A middleware that works between postgresql servers and postgresql clients";
     license = licenses.free;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
index 129292e88907..ec325fc3e42e 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix
@@ -141,7 +141,7 @@ let
     };
 
     meta = with lib; {
-      homepage    = https://www.postgresql.org;
+      homepage    = "https://www.postgresql.org";
       description = "A powerful, open source object-relational database system";
       license     = licenses.postgresql;
       maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ];
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 8bd50c3974c8..5525fc9f9655 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Columnar storage for PostgreSQL";
-    homepage    = https://www.citusdata.com/;
+    homepage    = "https://www.citusdata.com/";
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 1e5824d60d85..4af950973b2b 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Run Cron jobs through PostgreSQL";
-    homepage    = https://github.com/citusdata/pg_cron;
+    homepage    = "https://github.com/citusdata/pg_cron";
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index deac1072e65c..7630e2e32bac 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "HyperLogLog for PostgreSQL";
-    homepage    = https://www.citusdata.com/;
+    homepage    = "https://www.citusdata.com/";
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 2edc07c1d290..ee59e683ce85 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Partition management extension for PostgreSQL";
-    homepage    = https://github.com/pgpartman/pg_partman;
+    homepage    = "https://github.com/pgpartman/pg_partman";
     maintainers = with maintainers; [ ggpeti ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index b6300f78af25..0f8e2f61a6ec 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Efficient querying of 'top values' for PostgreSQL";
-    homepage    = https://github.com/citusdata/postgresql-topn;
+    homepage    = "https://github.com/citusdata/postgresql-topn";
     maintainers = with maintainers; [ thoughtpolice ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.agpl3;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 13aa5d942e54..5f1b6b819e8f 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality";
-    homepage    = https://pgrouting.org/;
+    homepage    = "https://pgrouting.org/";
     maintainers = [ maintainers.steve-chavez ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 54e92b977bcc..d86c70984019 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       It can also be used in the xUnit testing style.
     '';
     maintainers = with maintainers; [ willibutz ];
-    homepage = https://pgtap.org;
+    homepage = "https://pgtap.org";
     inherit (postgresql.meta) platforms;
     license = licenses.mit;
   };
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
index 4a80e5cafcb7..3bca35095c4c 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "High-performance time-series aggregation for PostgreSQL";
-    homepage = https://www.pipelinedb.com/;
+    homepage = "https://www.pipelinedb.com/";
     license = licenses.asl20;
     platforms = postgresql.meta.platforms;
     maintainers = [ maintainers.marsam ];
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
index 70ba715cf66e..c8e26b5a82b8 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Geographic Objects for PostgreSQL";
-    homepage = https://postgis.net/;
+    homepage = "https://postgis.net/";
     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
     license = licenses.gpl2;
     maintainers = [ maintainers.marcweber ];
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index ddefaea1549d..70b8dd309272 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)";
-    homepage    = https://github.com/tds-fdw/tds_fdw;
+    homepage    = "https://github.com/tds-fdw/tds_fdw";
     maintainers = [ maintainers.steve-chavez ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
index 7a4b1ed88fc4..eaf63fcba6e9 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Temporal Tables PostgreSQL Extension ";
-    homepage    = https://github.com/mlt/temporal_tables;
+    homepage    = "https://github.com/mlt/temporal_tables";
     maintainers = with maintainers; [ ggpeti ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.bsd2;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 42a8d9de49ee..cda9244e192f 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb";
-  version = "1.6.1";
+  version = "1.7.0";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq";
+    sha256 = "0n234ard9sldpbdqvbq2i48xyiyj8ljirsbspsax11f8yzy9ziac";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
-    homepage    = https://www.timescale.com/;
+    homepage    = "https://www.timescale.com/";
     maintainers = with maintainers; [ volth marsam ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.asl20;
diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 77e4cd9df7ae..f05fa6312d8f 100644
--- a/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Provides a few PostgreSQL functions for a lower-level data full text search";
-    homepage = https://github.com/zulip/tsearch_extras/;
+    homepage = "https://github.com/zulip/tsearch_extras/";
     license = licenses.postgresql;
     platforms = postgresql.meta.platforms;
     maintainers = with maintainers; [ DerTim1 ];
diff --git a/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix b/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix
index 0daf7533a604..efd8cd02a15b 100644
--- a/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SQL/RDF database used by, e.g., KDE-nepomuk";
-    homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
+    homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/";
     platforms = platforms.linux;
     license = licenses.gpl2;
   };
diff --git a/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix b/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
index 17ec49d16131..bca1aae82e51 100644
--- a/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SQL/RDF database used by, e.g., KDE-nepomuk";
-    homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
+    homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/";
     #configure: The current version [...] can only be built on 64bit platforms
     platforms = [ "x86_64-linux" ];
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/servers/squid/default.nix b/nixpkgs/pkgs/servers/squid/default.nix
index 8452adcf2221..a5274c855f77 100644
--- a/nixpkgs/pkgs/servers/squid/default.nix
+++ b/nixpkgs/pkgs/servers/squid/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
-    homepage = http://www.squid-cache.org;
+    homepage = "http://www.squid-cache.org";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz raskin ];
diff --git a/nixpkgs/pkgs/servers/sslh/default.nix b/nixpkgs/pkgs/servers/sslh/default.nix
index f7b4dd84d329..cbeacece3e1e 100644
--- a/nixpkgs/pkgs/servers/sslh/default.nix
+++ b/nixpkgs/pkgs/servers/sslh/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
     license = licenses.gpl2Plus;
-    homepage = https://www.rutschle.net/tech/sslh/README.html;
+    homepage = "https://www.rutschle.net/tech/sslh/README.html";
     maintainers = with maintainers; [ koral fpletz ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/syncserver/default.nix b/nixpkgs/pkgs/servers/syncserver/default.nix
index d41923758017..24c093fde505 100644
--- a/nixpkgs/pkgs/servers/syncserver/default.nix
+++ b/nixpkgs/pkgs/servers/syncserver/default.nix
@@ -39,7 +39,7 @@ in python.pkgs.buildPythonPackage rec {
 
   meta = with lib; {
     description = "Run-Your-Own Firefox Sync Server";
-    homepage = https://github.com/mozilla-services/syncserver;
+    homepage = "https://github.com/mozilla-services/syncserver";
     platforms = platforms.unix;
     license = licenses.mpl20;
     maintainers = with maintainers; [ nadrieril ];
diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix
index 32102dd48b5a..73b0a57b694a 100644
--- a/nixpkgs/pkgs/servers/tautulli/default.nix
+++ b/nixpkgs/pkgs/servers/tautulli/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.2.1";
   pname = "Tautulli";
 
   pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "10ahmgm4pr7lz39qcmgjqzlp435i2dasd6y47zpi1c5fy62jq4is";
+    sha256 = "0vcm9xjywy0c8lb37vdrn9payn80isij09lqkam37j08v5y64ln7";
   };
 
   buildPhase = ":";
diff --git a/nixpkgs/pkgs/servers/tegola/default.nix b/nixpkgs/pkgs/servers/tegola/default.nix
index ac3dccdab738..7dc32972fe47 100644
--- a/nixpkgs/pkgs/servers/tegola/default.nix
+++ b/nixpkgs/pkgs/servers/tegola/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://www.tegola.io/;
+    homepage = "https://www.tegola.io/";
     description = "Mapbox Vector Tile server";
     maintainers = with maintainers; [ ingenieroariel ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix b/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
index 836fa33f3f75..ca188ee951d9 100644
--- a/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
+++ b/nixpkgs/pkgs/servers/tmate-ssh-server/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage    = https://tmate.io/;
+    homepage    = "https://tmate.io/";
     description = "tmate SSH Server";
     license     = licenses.mit;
     platforms   = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix
index f3c97e8adcc1..0487ed177d04 100644
--- a/nixpkgs/pkgs/servers/traefik/default.nix
+++ b/nixpkgs/pkgs/servers/traefik/default.nix
@@ -1,39 +1,37 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:
+{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "traefik";
-  version = "1.7.14";
-
-  goPackagePath = "github.com/containous/traefik";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v";
+    sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92";
   };
 
-  nativeBuildInputs = [ go-bindata bash ];
-
-  buildPhase = ''
-    runHook preBuild
-    (
-      cd go/src/github.com/containous/traefik
-      bash ./script/make.sh generate
-
-      CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
-      go build -ldflags "\
-        -X github.com/containous/traefik/version.Version=${version} \
-        -X github.com/containous/traefik/version.Codename=$CODENAME \
-      " -a -o $bin/bin/traefik ./cmd/traefik
-    )
-    runHook postBuild
+  modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx";
+  subPackages = [ "cmd/traefik" ];
+
+  nativeBuildInputs = [ go-bindata ];
+
+  passthru.tests = { inherit (nixosTests) traefik; };
+
+  preBuild = ''
+    go generate
+
+    CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
+
+    makeFlagsArray+=("-ldflags=\
+      -X github.com/containous/traefik/version.Version=${version} \
+      -X github.com/containous/traefik/version.Codename=$CODENAME")
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://traefik.io;
+    homepage = "https://traefik.io";
     description = "A modern reverse proxy";
     license = licenses.mit;
-    maintainers = with maintainers; [ hamhut1066 vdemeester ];
+    maintainers = with maintainers; [ vdemeester ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/tt-rss/default.nix b/nixpkgs/pkgs/servers/tt-rss/default.nix
index c1694316f3ed..4478c4ab8d7d 100644
--- a/nixpkgs/pkgs/servers/tt-rss/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Web-based news feed (RSS/Atom) aggregator";
     license = licenses.gpl2Plus;
-    homepage = https://tt-rss.org;
+    homepage = "https://tt-rss.org";
     maintainers = with maintainers; [ globin zohl ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
index 0600640155be..14e6eaa77ae3 100644
--- a/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Plugin for TT-RSS to authenticate users via ldap";
     license = licenses.asl20;
-    homepage = https://github.com/hydrian/TTRSS-Auth-LDAP;
+    homepage = "https://github.com/hydrian/TTRSS-Auth-LDAP";
     maintainers = with maintainers; [ mic92 ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
index 7c3d6a5b57e2..a6f47c1ccbf9 100644
--- a/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix
@@ -23,7 +23,7 @@
       The name of the plugin in TT-RSS is 'tumblr_gdpr'.
     '';
     license = licenses.gpl3;
-    homepage = https://github.com/GregThib/ttrss-tumblr-gdpr;
+    homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr";
     maintainers = with maintainers; [ das_j ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/ttyd/default.nix b/nixpkgs/pkgs/servers/ttyd/default.nix
index 3358973fc4eb..bee9b0e9a7c0 100644
--- a/nixpkgs/pkgs/servers/ttyd/default.nix
+++ b/nixpkgs/pkgs/servers/ttyd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Share your terminal over the web";
-    homepage    = https://github.com/tsl0922/ttyd;
+    homepage    = "https://github.com/tsl0922/ttyd";
     license     = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
     platforms   = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/servers/tvheadend/default.nix b/nixpkgs/pkgs/servers/tvheadend/default.nix
index 9a01bf3eed63..009dd9bfc43f 100644
--- a/nixpkgs/pkgs/servers/tvheadend/default.nix
+++ b/nixpkgs/pkgs/servers/tvheadend/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
 	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android
         supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.
 	Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.'';
-    homepage = https://tvheadend.org;
+    homepage = "https://tvheadend.org";
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ simonvandel ];
diff --git a/nixpkgs/pkgs/servers/u9fs/default.nix b/nixpkgs/pkgs/servers/u9fs/default.nix
index 4f5d9636fe6b..3dea897971aa 100644
--- a/nixpkgs/pkgs/servers/u9fs/default.nix
+++ b/nixpkgs/pkgs/servers/u9fs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "u9fs-20110513";
   src = fetchhg {
-    url = https://bitbucket.org/plan9-from-bell-labs/u9fs;
+    url = "https://bitbucket.org/plan9-from-bell-labs/u9fs";
     rev = "9474edb23b11";
     sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6";
   };
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib;
     { description = "Serve 9P from Unix";
-      homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs;
+      homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs";
       license = licenses.free;
       maintainers = [ maintainers.ehmry ];
       platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/udpt/default.nix b/nixpkgs/pkgs/servers/udpt/default.nix
index cddfdf9f48f6..2849f8c7e743 100644
--- a/nixpkgs/pkgs/servers/udpt/default.nix
+++ b/nixpkgs/pkgs/servers/udpt/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A lightweight UDP torrent tracker";
-    homepage = https://naim94a.github.io/udpt;
+    homepage = "https://naim94a.github.io/udpt";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
diff --git a/nixpkgs/pkgs/servers/uftp/default.nix b/nixpkgs/pkgs/servers/uftp/default.nix
index 13e7fb7b93b6..13efb08ec6a8 100644
--- a/nixpkgs/pkgs/servers/uftp/default.nix
+++ b/nixpkgs/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "uftp";
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "1xi2cvn1lxk1h1kilmjiq8ybxln3rrh6m5cd340zg20vpzz56cwh";
+    sha256 = "01c54mqz37157dfq47zjqvfy7v98vbi9zn9mzrxszsz0gyq6mazc";
   };
 
   buildInputs = [ openssl ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Encrypted UDP based FTP with multicast";
-    homepage = http://uftp-multicast.sourceforge.net/;
+    homepage = "http://uftp-multicast.sourceforge.net/";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/nixpkgs/pkgs/servers/uhub/default.nix b/nixpkgs/pkgs/servers/uhub/default.nix
index 11dd5449b4b0..05c67b0ce1cf 100644
--- a/nixpkgs/pkgs/servers/uhub/default.nix
+++ b/nixpkgs/pkgs/servers/uhub/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "High performance peer-to-peer hub for the ADC network";
-    homepage = https://www.uhub.org/;
+    homepage = "https://www.uhub.org/";
     license = licenses.gpl3;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/unfs3/default.nix b/nixpkgs/pkgs/servers/unfs3/default.nix
index 4304dc229e35..c2a0fbbd1c20 100644
--- a/nixpkgs/pkgs/servers/unfs3/default.nix
+++ b/nixpkgs/pkgs/servers/unfs3/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
          server.
       '';
 
-    homepage = http://unfs3.sourceforge.net/;
+    homepage = "http://unfs3.sourceforge.net/";
 
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix
index f86ae9d7cec4..3d49d4d71b5b 100644
--- a/nixpkgs/pkgs/servers/unifi/default.nix
+++ b/nixpkgs/pkgs/servers/unifi/default.nix
@@ -30,7 +30,7 @@ let
     '';
 
     meta = with stdenv.lib; {
-      homepage = http://www.ubnt.com/;
+      homepage = "http://www.ubnt.com/";
       description = "Controller for Ubiquiti UniFi access points";
       license = licenses.unfree;
       platforms = platforms.unix;
@@ -49,7 +49,7 @@ in {
   };
 
   unifiStable = generic {
-    version = "5.12.35";
-    sha256 = "0ln8x7yisanbx1afclhffa0f3fk0sgh7dpj548xyhn5mgpwbj4i2";
+    version = "5.12.66";
+    sha256 = "119jdwk2ys3vzg9wa4h25rwgl6sjly6v52k1g1ycrq0bspzxdhm2";
   };
 }
diff --git a/nixpkgs/pkgs/servers/ursadb/default.nix b/nixpkgs/pkgs/servers/ursadb/default.nix
new file mode 100644
index 000000000000..8a2f768443f5
--- /dev/null
+++ b/nixpkgs/pkgs/servers/ursadb/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, cmake, zeromq, cppzmq }:
+
+stdenv.mkDerivation {
+  name = "ursadb";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/CERT-Polska/ursadb/archive/v1.2.0.tar.gz";
+    sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ursadb $out/bin/
+    cp ursadb_new $out/bin/
+    cp ursadb_trim $out/bin/
+  '';
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    zeromq
+    cppzmq
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/CERT-Polska/ursadb";
+    description = "Trigram database written in C++, suited for malware indexing";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ msm ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/servers/uwsgi/default.nix b/nixpkgs/pkgs/servers/uwsgi/default.nix
index 7669053d2294..29b807f17920 100644
--- a/nixpkgs/pkgs/servers/uwsgi/default.nix
+++ b/nixpkgs/pkgs/servers/uwsgi/default.nix
@@ -4,10 +4,15 @@
 , pam, withPAM ? stdenv.isLinux
 , systemd, withSystemd ? stdenv.isLinux
 , python2, python3, ncurses
-, ruby, php-embed, libmysqlclient
+, ruby, php, libmysqlclient
 }:
 
-let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
+let php-embed = php.override {
+      config.php.embed = true;
+      config.php.apxs2 = false;
+    };
+
+    pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
                            interpreter = pkg.interpreter;
                            path = "plugins/python";
                            inputs = [ pkg ncurses ];
@@ -92,7 +97,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed);
 
   meta = with stdenv.lib; {
-    homepage = https://uwsgi-docs.readthedocs.org/en/latest/;
+    homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
     description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar schneefux globin ];
diff --git a/nixpkgs/pkgs/servers/varnish/default.nix b/nixpkgs/pkgs/servers/varnish/default.nix
index 8d49846cbc04..27e0edfcc2b2 100644
--- a/nixpkgs/pkgs/servers/varnish/default.nix
+++ b/nixpkgs/pkgs/servers/varnish/default.nix
@@ -32,7 +32,7 @@ let
 
       meta = with stdenv.lib; {
         description = "Web application accelerator also known as a caching HTTP reverse proxy";
-        homepage = https://www.varnish-cache.org;
+        homepage = "https://www.varnish-cache.org";
         license = licenses.bsd2;
         maintainers = with maintainers; [ fpletz ];
         platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/servers/varnish/digest.nix b/nixpkgs/pkgs/servers/varnish/digest.nix
index f11c577288f7..8d69451f8b5e 100644
--- a/nixpkgs/pkgs/servers/varnish/digest.nix
+++ b/nixpkgs/pkgs/servers/varnish/digest.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Digest and HMAC vmod";
-    homepage = https://github.com/varnish/libvmod-digest;
+    homepage = "https://github.com/varnish/libvmod-digest";
     inherit (varnish.meta) license platforms maintainers;
   };
 }
diff --git a/nixpkgs/pkgs/servers/varnish/dynamic.nix b/nixpkgs/pkgs/servers/varnish/dynamic.nix
index 7db4680ac62a..c43f00b7a6bb 100644
--- a/nixpkgs/pkgs/servers/varnish/dynamic.nix
+++ b/nixpkgs/pkgs/servers/varnish/dynamic.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Dynamic director similar to the DNS director from Varnish 3";
-    homepage = https://github.com/nigoroll/libvmod-dynamic;
+    homepage = "https://github.com/nigoroll/libvmod-dynamic";
     inherit (varnish.meta) license platforms maintainers;
   };
 }
diff --git a/nixpkgs/pkgs/servers/varnish/modules.nix b/nixpkgs/pkgs/servers/varnish/modules.nix
index 32c462e4a775..69ee7028de87 100644
--- a/nixpkgs/pkgs/servers/varnish/modules.nix
+++ b/nixpkgs/pkgs/servers/varnish/modules.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
-    homepage = https://github.com/varnish/varnish-modules;
+    homepage = "https://github.com/varnish/varnish-modules";
     inherit (varnish.meta) license platforms maintainers;
   };
 }
diff --git a/nixpkgs/pkgs/servers/web-apps/frab/default.nix b/nixpkgs/pkgs/servers/web-apps/frab/default.nix
index 0b0583f1fb6f..88e95be46195 100644
--- a/nixpkgs/pkgs/servers/web-apps/frab/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/frab/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Web-based conference planning and management system";
-    homepage = https://github.com/frab/frab;
+    homepage = "https://github.com/frab/frab";
     license = licenses.mit;
     broken = true; # 2018-09-08; no successful hydra build since 2018-02-14
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix
index 90a9a88986ed..372bda4061b6 100644
--- a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix
@@ -3,16 +3,16 @@
 let
   versions = {
     matomo = {
-      version = "3.13.3";
-      sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz";
+      version = "3.13.4";
+      sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw";
     };
 
     matomo-beta = {
-      version = "3.13.3";
+      version = "3.13.4";
       # `beta` examples: "b1", "rc1", null
       # TOOD when updating: use null if stable version is >= latest beta or release candidate
       beta = null;
-      sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz";
+      sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw";
     };
   };
   common = pname: { version, sha256, beta ? null }:
@@ -100,7 +100,7 @@ let
         meta = with stdenv.lib; {
           description = "A real-time web analytics application";
           license = licenses.gpl3Plus;
-          homepage = https://matomo.org/;
+          homepage = "https://matomo.org/";
           platforms = platforms.all;
           maintainers = with maintainers; [ florianjacob kiwi ];
         };
diff --git a/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix b/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
index d16d59af6b90..c23fb685c605 100644
--- a/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mediawiki";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = with stdenv.lib; fetchurl {
     url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
-    sha256 = "1lckjnharwxh9xb7gxdxrkb0r3xgd0dh4019cnbixn5mmzgc696y";
+    sha256 = "0jg1ls5xy2bmvvd63lpvnkj53rfmik6sy2px14mphxba3gbcpf5c";
   };
 
   prePatch = ''
diff --git a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index 1b61632824f2..8fea1f992565 100644
--- a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/mattrude/pgpkeyserver-lite;
+    homepage = "https://github.com/mattrude/pgpkeyserver-lite";
     description = "A lightweight static front-end for a sks keyserver.";
     license = licenses.gpl3;
     maintainers = with maintainers; [ calbrecht globin ];
diff --git a/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix b/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
index 5c105e85a872..0dca4acc6b99 100644
--- a/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/restya-board/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Web-based kanban board";
     license = licenses.osl3;
-    homepage = http://restya.com;
+    homepage = "http://restya.com";
     maintainers = with maintainers; [ tstrobel ];
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/searx/default.nix b/nixpkgs/pkgs/servers/web-apps/searx/default.nix
index 6545151df230..d0ff13917969 100644
--- a/nixpkgs/pkgs/servers/web-apps/searx/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/searx/default.nix
@@ -4,37 +4,40 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "searx";
-  version = "0.15.0";
+  version = "0.16.0";
 
   # Can not use PyPI because certain test files are missing.
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "searx";
     rev = "v${version}";
-    sha256 = "05si0fn57z1g80l6003cs0ypag2m6zyi3dgsi06pvjp066xbrjvd";
+    sha256 = "0hfa4nmis98yvghxw866rzjpmhb2ln8l6l8g9yx4m79b2lk76xcs";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace 'certifi==2017.11.5' 'certifi' \
-      --replace 'flask==1.0.2' 'flask==1.0.*' \
-      --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \
-      --replace 'lxml==4.2.3' 'lxml==4.2.*' \
-      --replace 'idna==2.7' 'idna' \
+      --replace 'certifi==2019.3.9' 'certifi' \
+      --replace 'flask==1.0.2' 'flask' \
+      --replace 'flask-babel==0.12.2' 'flask-babel' \
+      --replace 'jinja2==2.10.1' 'jinja2' \
+      --replace 'lxml==4.3.3' 'lxml' \
+      --replace 'idna==2.8' 'idna' \
       --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
-      --replace 'pyopenssl==18.0.0' 'pyopenssl' \
-      --replace 'python-dateutil==2.7.3' 'python-dateutil==2.7.*'
+      --replace 'pyopenssl==19.0.0' 'pyopenssl' \
+      --replace 'python-dateutil==2.8.0' 'python-dateutil==2.8.*' \
+      --replace 'pyyaml==5.1' 'pyyaml'
     substituteInPlace requirements-dev.txt \
       --replace 'plone.testing==5.0.0' 'plone.testing' \
-      --replace 'pep8==1.7.1' 'pep8==1.7.*' \
-      --replace 'splinter==0.7.5' 'splinter' \
-      --replace 'selenium==3.5.0' 'selenium'
+      --replace 'pep8==1.7.0' 'pep8==1.7.*' \
+      --replace 'splinter==0.11.0' 'splinter' \
+      --replace 'selenium==3.141.0' 'selenium'
   '';
 
   propagatedBuildInputs = [
     pyyaml lxml grequests flaskbabel flask requests
     gevent speaklater Babel pytz dateutil pygments
     pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
+    jinja2
   ];
 
   checkInputs = [
@@ -44,13 +47,12 @@ buildPythonApplication rec {
 
   preCheck = ''
     rm tests/test_robot.py # A variable that is imported is commented out
-    rm tests/unit/engines/pubmed.py
   '';
 
   meta = with lib; {
-    homepage = https://github.com/asciimoo/searx;
+    homepage = "https://github.com/asciimoo/searx";
     description = "A privacy-respecting, hackable metasearch engine";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ matejc fpletz globin ];
+    maintainers = with maintainers; [ matejc fpletz globin danielfullmer ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix b/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
index f6000fc42117..e54f9d74c1d2 100644
--- a/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/selfoss/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Web-based news feed (RSS/Atom) aggregator";
-    homepage = https://selfoss.aditu.de;
+    homepage = "https://selfoss.aditu.de";
     license = licenses.gpl3;
     maintainers = with maintainers; [ jtojnar regnat ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
index f5bce90c2341..288c30734fe1 100644
--- a/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shaarli/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The personal, minimalist, super-fast, database free, bookmarking service";
     license = licenses.gpl3Plus;
-    homepage = https://github.com/shaarli/Shaarli;
+    homepage = "https://github.com/shaarli/Shaarli";
     maintainers = with maintainers; [ schneefux ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix b/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
index b0829fce7339..bce08646a3b5 100644
--- a/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     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;
+    homepage = "https://github.com/kalvn/Shaarli-Material";
     maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
index bd17f2f267c6..dd4cdc08287b 100644
--- a/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/shiori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "shiori";
@@ -13,8 +13,6 @@ buildGoModule rec {
     sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Simple bookmark manager built with Go";
     homepage = "https://github.com/go-shiori/shiori";
diff --git a/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix b/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix
index 4be14b37bd2b..69270afb76bb 100644
--- a/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Web interface to manage virtual machines with libvirt";
-    homepage = https://github.com/cutelyst/Virtlyst;
+    homepage = "https://github.com/cutelyst/Virtlyst";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ fpletz ];
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
index a105531ff4e6..e4f1a3009ee1 100644
--- a/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       After a package upgrade, empty the `var/cache` folder.
     '';
     license = licenses.mit;
-    homepage = http://wallabag.org;
+    homepage = "http://wallabag.org";
     maintainers = with maintainers; [ schneefux ];
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 00ea34829aa1..9cab8c4a9bab 100644
--- a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wordpress";
-  version = "5.3.2";
+  version = "5.4";
 
   src = fetchurl {
     url = "https://wordpress.org/${pname}-${version}.tar.gz";
-    sha256 = "0rq1j431x0fvcpry721hxglszql4c80qr26fglcdlm51h9z6i1p1";
+    sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 97506ce74472..564660ab4862 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -9,7 +9,7 @@ lib.makeScope newScope (self: with self; {
     name = "appres-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2";
       sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -22,7 +22,7 @@ lib.makeScope newScope (self: with self; {
     name = "bdftopcf-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2;
+      url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2";
       sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -35,7 +35,7 @@ lib.makeScope newScope (self: with self; {
     name = "bitmap-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz;
+      url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz";
       sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -48,7 +48,7 @@ lib.makeScope newScope (self: with self; {
     name = "editres-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/editres-1.0.7.tar.bz2;
+      url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2";
       sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -61,7 +61,7 @@ lib.makeScope newScope (self: with self; {
     name = "encodings-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/encodings-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2";
       sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -74,7 +74,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2";
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -88,7 +88,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2";
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -102,7 +102,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2";
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -116,7 +116,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2";
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -130,7 +130,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2";
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -144,7 +144,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2";
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -157,7 +157,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2";
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -171,7 +171,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2";
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -185,7 +185,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2";
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -199,7 +199,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2";
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -213,7 +213,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2";
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -227,7 +227,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2";
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -241,7 +241,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2";
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -255,7 +255,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2";
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -269,7 +269,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2";
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -283,7 +283,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2";
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -297,7 +297,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2";
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -311,7 +311,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2";
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -325,7 +325,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2";
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -339,7 +339,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2";
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -353,7 +353,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2";
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -367,7 +367,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2";
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -381,7 +381,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2";
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -395,7 +395,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2";
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -409,7 +409,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2";
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -423,7 +423,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2";
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -437,7 +437,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2";
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -451,7 +451,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2";
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -465,7 +465,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2";
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -479,7 +479,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2";
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -493,7 +493,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2";
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -507,7 +507,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2";
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -521,7 +521,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2";
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -535,7 +535,7 @@ lib.makeScope newScope (self: with self; {
     name = "fonttosfnt-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2";
       sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -548,7 +548,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-util-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2;
+      url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2";
       sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -561,7 +561,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2";
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -575,7 +575,7 @@ lib.makeScope newScope (self: with self; {
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2";
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -589,7 +589,7 @@ lib.makeScope newScope (self: with self; {
     name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2";
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -602,7 +602,7 @@ lib.makeScope newScope (self: with self; {
     name = "iceauth-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2;
+      url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2";
       sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -615,7 +615,7 @@ lib.makeScope newScope (self: with self; {
     name = "ico-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/ico-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2";
       sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -628,7 +628,7 @@ lib.makeScope newScope (self: with self; {
     name = "imake-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2;
+      url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2";
       sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -641,7 +641,7 @@ lib.makeScope newScope (self: with self; {
     name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2;
+      url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2";
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -654,7 +654,7 @@ lib.makeScope newScope (self: with self; {
     name = "libFS-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2;
+      url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2";
       sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -667,7 +667,7 @@ lib.makeScope newScope (self: with self; {
     name = "libICE-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2;
+      url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2";
       sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -680,7 +680,7 @@ lib.makeScope newScope (self: with self; {
     name = "libSM-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2";
       sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -693,7 +693,7 @@ lib.makeScope newScope (self: with self; {
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2;
+      url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2";
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -706,7 +706,7 @@ lib.makeScope newScope (self: with self; {
     name = "libX11-1.6.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2;
+      url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2";
       sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -719,7 +719,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXScrnSaver-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2";
       sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -732,7 +732,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXTrap-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2";
       sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -745,7 +745,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXau-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2";
       sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -758,7 +758,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXaw-1.0.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2";
       sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -771,7 +771,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXaw3d-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2";
       sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -784,7 +784,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXcomposite-0.4.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2";
       sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -797,7 +797,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXcursor-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2";
       sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -810,7 +810,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXdamage-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2";
       sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -823,7 +823,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXdmcp-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2";
       sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -836,7 +836,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXext-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2";
       sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -849,7 +849,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXfixes-5.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2";
       sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -862,7 +862,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXfont-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2";
       sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -875,7 +875,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXfont2-2.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2";
       sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -888,7 +888,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXft-2.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2";
       sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -901,7 +901,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXi-1.7.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2";
       sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -914,7 +914,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXinerama-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2";
       sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -927,7 +927,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXmu-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2";
       sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -940,7 +940,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXp-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2";
       sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -953,7 +953,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXpm-3.5.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2";
       sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -966,7 +966,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXpresent-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2";
       sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -979,7 +979,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXrandr-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2";
       sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -992,7 +992,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXrender-0.9.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2";
       sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1005,7 +1005,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXres-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2";
       sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1018,7 +1018,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXt-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2";
       sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1031,7 +1031,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXtst-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2";
       sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1044,7 +1044,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXv-1.0.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2";
       sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1057,7 +1057,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXvMC-1.0.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2";
       sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1070,7 +1070,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXxf86dga-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2";
       sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1083,7 +1083,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXxf86misc-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2";
       sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1096,7 +1096,7 @@ lib.makeScope newScope (self: with self; {
     name = "libXxf86vm-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2";
       sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1109,7 +1109,7 @@ lib.makeScope newScope (self: with self; {
     name = "libdmx-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2";
       sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1122,7 +1122,7 @@ lib.makeScope newScope (self: with self; {
     name = "libfontenc-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2";
       sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1135,7 +1135,7 @@ lib.makeScope newScope (self: with self; {
     name = "libpciaccess-0.16";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2;
+      url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2";
       sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1148,7 +1148,7 @@ lib.makeScope newScope (self: with self; {
     name = "libpthread-stubs-0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2";
       sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1161,7 +1161,7 @@ lib.makeScope newScope (self: with self; {
     name = "libxcb-1.13.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2";
       sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1174,7 +1174,7 @@ lib.makeScope newScope (self: with self; {
     name = "libxkbfile-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2";
       sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1187,7 +1187,7 @@ lib.makeScope newScope (self: with self; {
     name = "libxshmfence-1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2";
       sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1200,7 +1200,7 @@ lib.makeScope newScope (self: with self; {
     name = "listres-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/listres-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2";
       sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1213,7 +1213,7 @@ lib.makeScope newScope (self: with self; {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2";
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1226,7 +1226,7 @@ lib.makeScope newScope (self: with self; {
     name = "luit-20190106";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz;
+      url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz";
       sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1239,7 +1239,7 @@ lib.makeScope newScope (self: with self; {
     name = "makedepend-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2";
       sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1252,7 +1252,7 @@ lib.makeScope newScope (self: with self; {
     name = "mkfontscale-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2;
+      url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2";
       sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1265,7 +1265,7 @@ lib.makeScope newScope (self: with self; {
     name = "oclock-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/oclock-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2";
       sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1278,7 +1278,7 @@ lib.makeScope newScope (self: with self; {
     name = "sessreg-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2";
       sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1291,7 +1291,7 @@ lib.makeScope newScope (self: with self; {
     name = "setxkbmap-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2;
+      url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2";
       sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1304,7 +1304,7 @@ lib.makeScope newScope (self: with self; {
     name = "smproxy-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2";
       sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1317,7 +1317,7 @@ lib.makeScope newScope (self: with self; {
     name = "transset-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/transset-1.0.2.tar.bz2;
+      url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2";
       sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1330,7 +1330,7 @@ lib.makeScope newScope (self: with self; {
     name = "twm-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/twm-1.0.10.tar.bz2;
+      url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2";
       sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1343,7 +1343,7 @@ lib.makeScope newScope (self: with self; {
     name = "util-macros-1.19.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2;
+      url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2";
       sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1356,7 +1356,7 @@ lib.makeScope newScope (self: with self; {
     name = "viewres-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/viewres-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2";
       sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1369,7 +1369,7 @@ lib.makeScope newScope (self: with self; {
     name = "x11perf-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2;
+      url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2";
       sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1382,7 +1382,7 @@ lib.makeScope newScope (self: with self; {
     name = "xauth-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xauth-1.1.tar.bz2;
+      url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2";
       sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1395,7 +1395,7 @@ lib.makeScope newScope (self: with self; {
     name = "xbacklight-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2";
       sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1408,7 +1408,7 @@ lib.makeScope newScope (self: with self; {
     name = "xbitmaps-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2";
       sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1421,7 +1421,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcalc-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2;
+      url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2";
       sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1434,7 +1434,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-proto-1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2";
       sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1447,7 +1447,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2";
       sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1460,7 +1460,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-cursor-0.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2";
       sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1473,7 +1473,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-errors-1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2";
       sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1486,7 +1486,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-image-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2";
       sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1499,7 +1499,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-keysyms-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2";
       sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1512,7 +1512,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2";
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1525,7 +1525,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2;
+      url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2";
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1538,7 +1538,7 @@ lib.makeScope newScope (self: with self; {
     name = "xclock-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xclock-1.0.9.tar.bz2;
+      url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2";
       sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1551,7 +1551,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcmsdb-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2";
       sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1564,7 +1564,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcompmgr-1.1.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2;
+      url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2";
       sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1577,7 +1577,7 @@ lib.makeScope newScope (self: with self; {
     name = "xconsole-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2;
+      url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2";
       sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1590,7 +1590,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcursorgen-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2;
+      url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2";
       sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1603,7 +1603,7 @@ lib.makeScope newScope (self: with self; {
     name = "xcursor-themes-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2";
       sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1616,7 +1616,7 @@ lib.makeScope newScope (self: with self; {
     name = "xdm-1.1.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2;
+      url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2";
       sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1629,7 +1629,7 @@ lib.makeScope newScope (self: with self; {
     name = "xdpyinfo-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2;
+      url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2";
       sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1642,7 +1642,7 @@ lib.makeScope newScope (self: with self; {
     name = "xdriinfo-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2";
       sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1655,7 +1655,7 @@ lib.makeScope newScope (self: with self; {
     name = "xev-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2";
       sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1668,7 +1668,7 @@ lib.makeScope newScope (self: with self; {
     name = "xeyes-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2";
       sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1681,7 +1681,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-evdev-2.10.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2";
       sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1694,7 +1694,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-joystick-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2";
       sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1707,7 +1707,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-keyboard-1.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2";
       sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1720,7 +1720,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-libinput-0.28.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2";
       sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1733,7 +1733,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-mouse-1.9.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2";
       sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1746,7 +1746,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-synaptics-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2";
       sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1759,7 +1759,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-vmmouse-13.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2";
       sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1772,7 +1772,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-input-void-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2";
       sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1785,7 +1785,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-amdgpu-19.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2";
       sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1798,7 +1798,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-apm-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2";
       sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1811,7 +1811,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-ark-0.7.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2";
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1824,7 +1824,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-ast-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2";
       sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1837,7 +1837,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-ati-19.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2";
       sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1850,7 +1850,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-chips-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2";
       sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1863,7 +1863,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-cirrus-1.5.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2";
       sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1876,7 +1876,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-dummy-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2";
       sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1889,7 +1889,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-fbdev-0.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2";
       sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1902,7 +1902,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-geode-2.11.19";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2";
       sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1915,7 +1915,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2";
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1928,7 +1928,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-glint-1.2.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2";
       sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1941,7 +1941,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-i128-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2";
       sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1954,7 +1954,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-i740-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2";
       sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1967,7 +1967,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-intel-2.99.917";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2";
       sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1980,7 +1980,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-mach64-6.9.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2";
       sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -1993,7 +1993,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-mga-2.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2";
       sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2006,7 +2006,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-neomagic-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2";
       sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2019,7 +2019,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-newport-0.2.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2";
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2032,7 +2032,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-nouveau-1.0.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2";
       sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2045,7 +2045,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-nv-2.1.21";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2";
       sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2058,7 +2058,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-omap-0.4.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2";
       sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2071,7 +2071,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-openchrome-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2";
       sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2084,7 +2084,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-qxl-0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2";
       sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2097,7 +2097,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-r128-6.11.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2";
       sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2110,7 +2110,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-rendition-4.2.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2";
       sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2123,7 +2123,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-s3virge-1.11.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2";
       sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2136,7 +2136,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-savage-2.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2";
       sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2149,7 +2149,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-siliconmotion-1.7.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2";
       sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2162,7 +2162,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-sis-0.11.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2";
       sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2175,7 +2175,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-sisusb-0.9.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2";
       sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2188,7 +2188,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2";
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2201,7 +2201,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-sunffb-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2";
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2214,7 +2214,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-sunleo-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2";
       sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2227,7 +2227,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-tdfx-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2";
       sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2240,7 +2240,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-tga-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2";
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2253,7 +2253,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-trident-1.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2";
       sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2266,7 +2266,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-v4l-0.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2";
       sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2279,7 +2279,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-vboxvideo-1.0.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2";
       sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2292,7 +2292,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-vesa-2.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2";
       sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2305,7 +2305,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-vmware-13.3.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2";
       sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2318,7 +2318,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-voodoo-1.2.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2";
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2331,7 +2331,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2";
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2344,7 +2344,7 @@ lib.makeScope newScope (self: with self; {
     name = "xf86-video-xgi-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2;
+      url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2";
       sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2357,7 +2357,7 @@ lib.makeScope newScope (self: with self; {
     name = "xfd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2";
       sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2370,7 +2370,7 @@ lib.makeScope newScope (self: with self; {
     name = "xfontsel-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2";
       sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2383,7 +2383,7 @@ lib.makeScope newScope (self: with self; {
     name = "xfs-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xfs-1.2.0.tar.bz2;
+      url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2";
       sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2396,7 +2396,7 @@ lib.makeScope newScope (self: with self; {
     name = "xfsinfo-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2";
       sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2409,7 +2409,7 @@ lib.makeScope newScope (self: with self; {
     name = "xgamma-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2";
       sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2422,7 +2422,7 @@ lib.makeScope newScope (self: with self; {
     name = "xgc-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2";
       sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2435,7 +2435,7 @@ lib.makeScope newScope (self: with self; {
     name = "xhost-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2;
+      url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2";
       sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2448,7 +2448,7 @@ lib.makeScope newScope (self: with self; {
     name = "xinit-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinit-1.4.1.tar.bz2;
+      url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2";
       sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2461,7 +2461,7 @@ lib.makeScope newScope (self: with self; {
     name = "xinput-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinput-1.6.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2";
       sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2474,7 +2474,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkbcomp-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2;
+      url = "mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2";
       sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2487,7 +2487,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkbevd-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2";
       sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2500,7 +2500,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkbprint-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2";
       sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2513,7 +2513,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2";
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2526,7 +2526,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkeyboard-config-2.27";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2;
+      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2";
       sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2539,7 +2539,7 @@ lib.makeScope newScope (self: with self; {
     name = "xkill-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2";
       sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2552,7 +2552,7 @@ lib.makeScope newScope (self: with self; {
     name = "xload-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xload-1.1.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2";
       sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2565,7 +2565,7 @@ lib.makeScope newScope (self: with self; {
     name = "xlsatoms-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2";
       sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2578,7 +2578,7 @@ lib.makeScope newScope (self: with self; {
     name = "xlsclients-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2";
       sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2591,7 +2591,7 @@ lib.makeScope newScope (self: with self; {
     name = "xlsfonts-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2";
       sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2604,7 +2604,7 @@ lib.makeScope newScope (self: with self; {
     name = "xmag-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2";
       sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2617,7 +2617,7 @@ lib.makeScope newScope (self: with self; {
     name = "xmessage-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2";
       sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2630,7 +2630,7 @@ lib.makeScope newScope (self: with self; {
     name = "xmodmap-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2;
+      url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2";
       sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2643,7 +2643,7 @@ lib.makeScope newScope (self: with self; {
     name = "xmore-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2";
       sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2656,7 +2656,7 @@ lib.makeScope newScope (self: with self; {
     name = "xorg-cf-files-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2";
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2669,7 +2669,7 @@ lib.makeScope newScope (self: with self; {
     name = "xorg-docs-1.7.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2;
+      url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2";
       sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2682,7 +2682,7 @@ lib.makeScope newScope (self: with self; {
     name = "xorgproto-2019.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2;
+      url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2";
       sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
-    name = "xorg-server-1.20.7";
+    name = "xorg-server-1.20.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2;
-      sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx";
+      url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2";
+      sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
@@ -2708,7 +2708,7 @@ lib.makeScope newScope (self: with self; {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2;
+      url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2";
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2721,7 +2721,7 @@ lib.makeScope newScope (self: with self; {
     name = "xpr-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xpr-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2";
       sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2734,7 +2734,7 @@ lib.makeScope newScope (self: with self; {
     name = "xprop-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xprop-1.2.4.tar.bz2";
       sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2747,7 +2747,7 @@ lib.makeScope newScope (self: with self; {
     name = "xrandr-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2;
+      url = "mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2";
       sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2760,7 +2760,7 @@ lib.makeScope newScope (self: with self; {
     name = "xrdb-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2;
+      url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2";
       sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2773,7 +2773,7 @@ lib.makeScope newScope (self: with self; {
     name = "xrefresh-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2;
+      url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2";
       sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2786,7 +2786,7 @@ lib.makeScope newScope (self: with self; {
     name = "xset-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xset-1.2.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2";
       sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2799,7 +2799,7 @@ lib.makeScope newScope (self: with self; {
     name = "xsetroot-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2;
+      url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2";
       sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2812,7 +2812,7 @@ lib.makeScope newScope (self: with self; {
     name = "xsm-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xsm-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2";
       sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2825,7 +2825,7 @@ lib.makeScope newScope (self: with self; {
     name = "xstdcmap-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2";
       sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2838,7 +2838,7 @@ lib.makeScope newScope (self: with self; {
     name = "xtrans-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2;
+      url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2";
       sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2851,7 +2851,7 @@ lib.makeScope newScope (self: with self; {
     name = "xtrap-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2;
+      url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2";
       sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2864,7 +2864,7 @@ lib.makeScope newScope (self: with self; {
     name = "xvinfo-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2";
       sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2877,7 +2877,7 @@ lib.makeScope newScope (self: with self; {
     name = "xwd-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xwd-1.0.7.tar.bz2;
+      url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2";
       sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2890,7 +2890,7 @@ lib.makeScope newScope (self: with self; {
     name = "xwininfo-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2;
+      url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2";
       sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543";
     };
     hardeningDisable = [ "bindnow" "relro" ];
@@ -2903,7 +2903,7 @@ lib.makeScope newScope (self: with self; {
     name = "xwud-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xwud-1.0.5.tar.bz2;
+      url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2";
       sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr";
     };
     hardeningDisable = [ "bindnow" "relro" ];
diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
index 58ebc6d984ee..e398b9b5d652 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix
@@ -291,7 +291,7 @@ self: super:
   libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
     name = "libxshmfence-1.3";
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2;
+      url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2";
       sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
     };
     outputs = [ "out" "dev" ]; # mainly to avoid propagation
@@ -571,7 +571,7 @@ self: super:
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;
           src = fetchurl {
-            url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;
+            url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2";
             sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
           };
           nativeBuildInputs = [ pkgconfig ];
@@ -581,7 +581,7 @@ self: super:
             name = "xorg-server-1.18.4";
             builder = ./builder.sh;
             src = fetchurl {
-              url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
+              url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2";
               sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
             };
             nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 8db2034f1bcc..556e999aacbd 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2
diff --git a/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index af526730ca97..e868dbab7f60 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "XCB utility functions for the X resource manager";
-    homepage = https://github.com/Airblader/xcb-util-xrm;
+    homepage = "https://github.com/Airblader/xcb-util-xrm";
     license = licenses.mit; # X11 variant
     platforms = with platforms; unix;
   };
diff --git a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix
index d033f211c3a5..a60025b79779 100644
--- a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix
+++ b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix
@@ -31,7 +31,7 @@ xorgserver.overrideAttrs (oldAttrs: {
 
   meta = {
     description = "An X server for interfacing X11 apps with the Wayland protocol";
-    homepage = https://wayland.freedesktop.org/xserver.html;
+    homepage = "https://wayland.freedesktop.org/xserver.html";
     license = licenses.mit;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/servers/xinetd/default.nix b/nixpkgs/pkgs/servers/xinetd/default.nix
index 445c6c57bbf1..ebe927a85d87 100644
--- a/nixpkgs/pkgs/servers/xinetd/default.nix
+++ b/nixpkgs/pkgs/servers/xinetd/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Secure replacement for inetd";
     platforms = stdenv.lib.platforms.linux;
-    homepage = http://xinetd.org;
+    homepage = "http://xinetd.org";
     license = stdenv.lib.licenses.free;
   };
 }
diff --git a/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix b/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
index c25c4baf13b8..e1cec51e4ab0 100644
--- a/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/biboumi/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   louiz_catch = fetchgit {
-    url = https://lab.louiz.org/louiz/Catch.git;
+    url = "https://lab.louiz.org/louiz/Catch.git";
     rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
     sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
   };
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Modern XMPP IRC gateway";
     platforms = platforms.unix;
-    homepage = https://lab.louiz.org/louiz/biboumi;
+    homepage = "https://lab.louiz.org/louiz/biboumi";
     license = licenses.zlib;
     maintainers = [ maintainers.woffs ];
   };
diff --git a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
index 0ac216b8e525..2cf4d9465aec 100644
--- a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
@@ -24,12 +24,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "20.01";
+  version = "20.03";
   pname = "ejabberd";
 
   src = fetchurl {
-    url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
-    sha256 = "14bgwa6y17bhnwhcqb2hdl7psds0iqkcawb4kpaw6d7lzzsx4ay6";
+    url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";
+    sha256 = "0i013l9cygmgainfid298n6llhs3mblfklry3jw2a6irvhffym0s";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "097c84qp00dq8x7ngfqcrv9fa0wm0k94grashmi1fxlasgbvxh18";
+    outputHash = "0xwgi9hy6y0m8mwznl6px98kdmkcxg98k62zgqbaqd4paks5zwqa";
   };
 
   configureFlags =
@@ -113,7 +113,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source XMPP application server written in Erlang";
     license = licenses.gpl2;
-    homepage = https://www.ejabberd.im;
+    homepage = "https://www.ejabberd.im";
     platforms = platforms.linux;
     maintainers = with maintainers; [ sander abbradar ajs124 ];
     broken = withElixir;
diff --git a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
index 8becdcd6a45b..0d552e9e1121 100644
--- a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
+++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
 
 
 stdenv.mkDerivation rec {
-  version = "0.11.3"; # also update communityModules
+  version = "0.11.5"; # also update communityModules
   pname = "prosody";
 
   src = fetchurl {
     url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
-    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
+    sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m";
   };
 
   # A note to all those merging automated updates: Please also update this
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   # version.
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "b54e98d5c4a1";
-    sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg";
+    rev = "acd231e2b46f";
+    sha256 = "1b33lsxrrrvarknqz9xs7j7f19bzxxymmfdhch7k70x3yyiwmfsy";
   };
 
   buildInputs = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
-    homepage = https://prosody.im;
+    homepage = "https://prosody.im";
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz globin ];
   };
diff --git a/nixpkgs/pkgs/servers/zoneminder/default.nix b/nixpkgs/pkgs/servers/zoneminder/default.nix
index 93f22e77f870..978893d28ffd 100644
--- a/nixpkgs/pkgs/servers/zoneminder/default.nix
+++ b/nixpkgs/pkgs/servers/zoneminder/default.nix
@@ -78,13 +78,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.34.3";
+  version = "1.34.9";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
+    sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic";
   };
 
   patches = [
@@ -170,10 +170,6 @@ in stdenv.mkDerivation rec {
     "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
     "-DZM_WEB_USER=${user}"
     "-DZM_WEB_GROUP=${user}"
-
-    # Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
-    # But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
-    "-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
   ];
 
   passthru = { inherit dirName; };
diff --git a/nixpkgs/pkgs/servers/zookeeper/default.nix b/nixpkgs/pkgs/servers/zookeeper/default.nix
index e45845359019..b0685d7f9546 100644
--- a/nixpkgs/pkgs/servers/zookeeper/default.nix
+++ b/nixpkgs/pkgs/servers/zookeeper/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://zookeeper.apache.org;
+    homepage = "http://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
     maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
author	Alyssa Ross <hi@alyssa.is>	2020-04-27 21:04:56 +0000
committer	Alyssa Ross <hi@alyssa.is>	2020-04-27 21:04:56 +0000
commit	a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch)
tree	47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/servers
parent	5b00523fb58512232b819a301c4309f579c7f09c (diff)
parent	22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff)
download	nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip