Upgrade nixos

author: Ismaël Bouya <ismael.bouya@normalesup.org> 2020-03-25 11:57:48 +0100
committer: Ismaël Bouya <ismael.bouya@normalesup.org> 2020-04-03 16:25:07 +0200
commit: 5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch)
tree: 6ed072da7b1f17ac3994ffea052aa0c0822f8446
parent: 441da8aac378f401625e82caf281fa0e26128310 (diff)
download: Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip
95 files changed, 5260 insertions, 1658 deletions
diff --git a/modules/acme2.nix b/modules/acme2.nix
deleted file mode 100644
index b22e4cc..0000000
--- a/modules/acme2.nix
+++ /dev/null
@@ -1,353 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  cfg = config.security.acme2;
-  certOpts = { name, ... }: {
-    options = {
-      webroot = mkOption {
-        type = types.str;
-        example = "/var/lib/acme/acme-challenges";
-        description = ''
-          Where the webroot of the HTTP vhost is located.
-          <filename>.well-known/acme-challenge/</filename> directory
-          will be created below the webroot if it doesn't exist.
-          <literal>http://example.org/.well-known/acme-challenge/</literal> must also
-          be available (notice unencrypted HTTP).
-        '';
-      };
-      server = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          ACME Directory Resource URI. Defaults to let's encrypt
-          production endpoint,
-          https://acme-v02.api.letsencrypt.org/directory, if unset.
-        '';
-      };
-      domain = mkOption {
-        type = types.str;
-        default = name;
-        description = "Domain to fetch certificate for (defaults to the entry name)";
-      };
-      email = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = "Contact email address for the CA to be able to reach you.";
-      };
-      user = mkOption {
-        type = types.str;
-        default = "root";
-        description = "User running the ACME client.";
-      };
-      group = mkOption {
-        type = types.str;
-        default = "root";
-        description = "Group running the ACME client.";
-      };
-      allowKeysForGroup = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Give read permissions to the specified group
-          (<option>security.acme2.cert.&lt;name&gt;.group</option>) to read SSL private certificates.
-        '';
-      };
-      postRun = mkOption {
-        type = types.lines;
-        default = "";
-        example = "systemctl reload nginx.service";
-        description = ''
-          Commands to run after new certificates go live. Typically
-          the web server and other servers using certificates need to
-          be reloaded.
-          Executed in the same directory with the new certificate.
-        '';
-      };
-      plugins = mkOption {
-        type = types.listOf (types.enum [
-          "cert.der" "cert.pem" "chain.pem" "external.sh"
-          "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json" "account_reg.json"
-        ]);
-        default = [ "fullchain.pem" "full.pem" "key.pem" "account_key.json" "account_reg.json" ];
-        description = ''
-          Plugins to enable. With default settings simp_le will
-          store public certificate bundle in <filename>fullchain.pem</filename>,
-          private key in <filename>key.pem</filename> and those two previous
-          files combined in <filename>full.pem</filename> in its state directory.
-        '';
-      };
-      directory = mkOption {
-        type = types.str;
-        readOnly = true;
-        default = "/var/lib/acme/${name}";
-        description = "Directory where certificate and other state is stored.";
-      };
-      extraDomains = mkOption {
-        type = types.attrsOf (types.nullOr types.str);
-        default = {};
-        example = literalExample ''
-          {
-            "example.org" = "/srv/http/nginx";
-            "mydomain.org" = null;
-          }
-        '';
-        description = ''
-          A list of extra domain names, which are included in the one certificate to be issued, with their
-          own server roots if needed.
-        '';
-      };
-    };
-  };
-in
-{
-  ###### interface
-  imports = [
-    (mkRemovedOptionModule [ "security" "acme2" "production" ] ''
-      Use security.acme2.server to define your staging ACME server URL instead.
-      To use the let's encrypt staging server, use security.acme2.server =
-      "https://acme-staging-v02.api.letsencrypt.org/directory".
-    ''
-    )
-    (mkRemovedOptionModule [ "security" "acme2" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
-    (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
-    (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
-  ];
-  options = {
-    security.acme2 = {
-      validMin = mkOption {
-        type = types.int;
-        default = 30 * 24 * 3600;
-        description = "Minimum remaining validity before renewal in seconds.";
-      };
-      renewInterval = mkOption {
-        type = types.str;
-        default = "weekly";
-        description = ''
-          Systemd calendar expression when to check for renewal. See
-          <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>7</manvolnum></citerefentry>.
-        '';
-      };
-      server = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          ACME Directory Resource URI. Defaults to let's encrypt
-          production endpoint,
-          <literal>https://acme-v02.api.letsencrypt.org/directory</literal>, if unset.
-        '';
-      };
-      preliminarySelfsigned = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether a preliminary self-signed certificate should be generated before
-          doing ACME requests. This can be useful when certificates are required in
-          a webserver, but ACME needs the webserver to make its requests.
-          With preliminary self-signed certificate the webserver can be started and
-          can later reload the correct ACME certificates.
-        '';
-      };
-      certs = mkOption {
-        default = { };
-        type = with types; attrsOf (submodule certOpts);
-        description = ''
-          Attribute set of certificates to get signed and renewed. Creates
-          <literal>acme-''${cert}.{service,timer}</literal> systemd units for
-          each certificate defined here. Other services can add dependencies
-          to those units if they rely on the certificates being present,
-          or trigger restarts of the service if certificates get renewed.
-        '';
-        example = literalExample ''
-          {
-            "example.com" = {
-              webroot = "/var/www/challenges/";
-              email = "foo@example.com";
-              extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; };
-            };
-            "bar.example.com" = {
-              webroot = "/var/www/challenges/";
-              email = "bar@example.com";
-            };
-          }
-        '';
-      };
-    };
-  };
-  ###### implementation
-  config = mkMerge [
-    (mkIf (cfg.certs != { }) {
-      systemd.services = let
-          services = concatLists servicesLists;
-          servicesLists = mapAttrsToList certToServices cfg.certs;
-          certToServices = cert: data:
-              let
-                lpath = "acme/${cert}";
-                rights = if data.allowKeysForGroup then "750" else "700";
-                cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
-                          ++ optionals (data.email != null) [ "--email" data.email ]
-                          ++ concatMap (p: [ "-f" p ]) data.plugins
-                          ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
-                          ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)];
-                acmeService = {
-                  description = "Renew ACME Certificate for ${cert}";
-                  after = [ "network.target" "network-online.target" ];
-                  wants = [ "network-online.target" ];
-                  # simp_le uses requests, which uses certifi under the hood,
-                  # which doesn't respect the system trust store.
-                  # At least in the acme test, we provision a fake CA, impersonating the LE endpoint.
-                  # REQUESTS_CA_BUNDLE is a way to teach python requests to use something else
-                  environment.REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
-                  serviceConfig = {
-                    Type = "oneshot";
-                    # With RemainAfterExit the service is considered active even
-                    # after the main process having exited, which means when it
-                    # gets changed, the activation phase restarts it, meaning
-                    # the permissions of the StateDirectory get adjusted
-                    # according to the specified group
-                    # Edit: Timers will never run because of this
-                    # RemainAfterExit = true;
-                    SuccessExitStatus = [ "0" "1" ];
-                    User = data.user;
-                    Group = data.group;
-                    PrivateTmp = true;
-                    StateDirectory = lpath;
-                    StateDirectoryMode = rights;
-                    ExecStartPre =
-                      let
-                        script = pkgs.writeScript "acme-pre-start" ''
-                          #!${pkgs.runtimeShell} -e
-                          mkdir -p '${data.webroot}/.well-known/acme-challenge'
-                          chmod a+w '${data.webroot}/.well-known/acme-challenge'
-                          #doesn't work for multiple concurrent runs
-                          #chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
-                        '';
-                      in
-                        "+${script}";
-                    WorkingDirectory = "/var/lib/${lpath}";
-                    ExecStart = "${pkgs.simp_le_0_17}/bin/simp_le ${escapeShellArgs cmdline}";
-                    ExecStartPost =
-                      let
-                        script = pkgs.writeScript "acme-post-start" ''
-                          #!${pkgs.runtimeShell} -e
-                          ${data.postRun}
-                        '';
-                      in
-                        "+${script}";
-                  };
-                };
-                selfsignedService = {
-                  description = "Create preliminary self-signed certificate for ${cert}";
-                  path = [ pkgs.openssl ];
-                  script =
-                    ''
-                      workdir="$(mktemp -d)"
-                      # Create CA
-                      openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048
-                      openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key
-                      openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \
-                        -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com"
-                      openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt
-                      # Create key
-                      openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048
-                      openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key
-                      openssl req -new -key $workdir/server.key -out $workdir/server.csr \
-                        -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com"
-                      openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \
-                        -CAkey $workdir/ca.key -CAserial $workdir/ca.srl -CAcreateserial \
-                        -out $workdir/server.crt
-                      # Copy key to destination
-                      cp $workdir/server.key /var/lib/${lpath}/key.pem
-                      # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates)
-                      cat $workdir/{server.crt,ca.crt} > "/var/lib/${lpath}/fullchain.pem"
-                      # Create full.pem for e.g. lighttpd
-                      cat $workdir/{server.key,server.crt,ca.crt} > "/var/lib/${lpath}/full.pem"
-                      # Give key acme permissions
-                      chown '${data.user}:${data.group}' "/var/lib/${lpath}/"{key,fullchain,full}.pem
-                      chmod ${rights} "/var/lib/${lpath}/"{key,fullchain,full}.pem
-                    '';
-                  serviceConfig = {
-                    Type = "oneshot";
-                    PrivateTmp = true;
-                    StateDirectory = lpath;
-                    User = data.user;
-                    Group = data.group;
-                  };
-                  unitConfig = {
-                    # Do not create self-signed key when key already exists
-                    ConditionPathExists = "!/var/lib/${lpath}/key.pem";
-                  };
-                };
-              in (
-                [ { name = "acme-${cert}"; value = acmeService; } ]
-                ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; }
-              );
-          servicesAttr = listToAttrs services;
-        in
-          servicesAttr;
-      # FIXME: this doesn't work for multiple users
-      systemd.tmpfiles.rules =
-        flip mapAttrsToList cfg.certs
-        (cert: data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}");
-      systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
-        ("acme-${cert}")
-        ({
-          description = "Renew ACME Certificate for ${cert}";
-          wantedBy = [ "timers.target" ];
-          timerConfig = {
-            OnCalendar = cfg.renewInterval;
-            Unit = "acme-${cert}.service";
-            Persistent = "yes";
-            AccuracySec = "5m";
-            RandomizedDelaySec = "1h";
-          };
-        })
-      );
-      systemd.targets.acme-selfsigned-certificates = mkIf cfg.preliminarySelfsigned {};
-      systemd.targets.acme-certificates = {};
-    })
-  ];
-  meta = {
-    maintainers = with lib.maintainers; [ abbradar fpletz globin ];
-    #doc = ./acme.xml;
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
index 98dc77d..9ff6ea6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -19,5 +19,4 @@
  php-application = ./websites/php-application.nix;
  websites = ./websites;
-  acme2 = ./acme2.nix;
 } // (if builtins.pathExists ./private then import ./private else {})
diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index 47e30fc..c8ee48e 100644
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -180,6 +180,7 @@ in
      ${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList
        (k: v: "install -Dm600 -o buildbot -g buildbot -T /var/secrets/buildbot/${project.name}/${k} $buildbot_secrets/${k}") project.secrets
      )}
+      ${buildbot}/bin/buildbot upgrade-master ${varDir}/${project.name}
      '';
      environment = let
        project_env = with lib.attrsets;
diff --git a/modules/private/certificates.nix b/modules/private/certificates.nix
index f057200..2bf2730 100644
--- a/modules/private/certificates.nix
+++ b/modules/private/certificates.nix
@@ -30,9 +30,9 @@
    myServices.databasesCerts = config.myServices.certificates.certConfig;
    myServices.ircCerts = config.myServices.certificates.certConfig;
-    security.acme2.preliminarySelfsigned = true;
+    security.acme.preliminarySelfsigned = true;
-    security.acme2.certs = {
+    security.acme.certs = {
      "${name}" = config.myServices.certificates.certConfig // {
        domain = config.hostEnv.fqdn;
      };
@@ -41,17 +41,33 @@
    systemd.services = lib.attrsets.mapAttrs' (k: v:
      lib.attrsets.nameValuePair "acme-selfsigned-${k}" (lib.mkBefore { script =
        (lib.optionalString (builtins.elem "cert.pem" v.plugins) ''
-        cp $workdir/server.crt ${config.security.acme2.certs."${k}".directory}/cert.pem
+        cp $workdir/server.crt ${config.security.acme.certs."${k}".directory}/cert.pem
-        chown '${v.user}:${v.group}' ${config.security.acme2.certs."${k}".directory}/cert.pem
+        chown '${v.user}:${v.group}' ${config.security.acme.certs."${k}".directory}/cert.pem
-        chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme2.certs."${k}".directory}/cert.pem
+        chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.certs."${k}".directory}/cert.pem
        '') +
        (lib.optionalString (builtins.elem "chain.pem" v.plugins) ''
-        cp $workdir/ca.crt ${config.security.acme2.certs."${k}".directory}/chain.pem
+        cp $workdir/ca.crt ${config.security.acme.certs."${k}".directory}/chain.pem
-        chown '${v.user}:${v.group}' ${config.security.acme2.certs."${k}".directory}/chain.pem
+        chown '${v.user}:${v.group}' ${config.security.acme.certs."${k}".directory}/chain.pem
-        chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme2.certs."${k}".directory}/chain.pem
+        chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.certs."${k}".directory}/chain.pem
        '')
      ; })
-    ) config.security.acme2.certs // {
+    ) config.security.acme.certs //
+    lib.attrsets.mapAttrs' (k: data:
+      lib.attrsets.nameValuePair "acme-${k}" {
+        serviceConfig.ExecStartPre =
+          let
+            script = pkgs.writeScript "acme-pre-start" ''
+              #!${pkgs.runtimeShell} -e
+              mkdir -p '${data.webroot}/.well-known/acme-challenge'
+              chmod a+w '${data.webroot}/.well-known/acme-challenge'
+              #doesn't work for multiple concurrent runs
+              #chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
+            '';
+          in
+            "+${script}";
+      }
+    ) config.security.acme.certs //
+    {
      httpdProd = lib.mkIf config.services.httpd.Prod.enable
        { after = [ "acme-selfsigned-certificates.target" ]; wants = [ "acme-selfsigned-certificates.target" ]; };
      httpdTools = lib.mkIf config.services.httpd.Tools.enable
diff --git a/modules/private/databases/mariadb.nix b/modules/private/databases/mariadb.nix
index ed647ea..04e4bd6 100644
--- a/modules/private/databases/mariadb.nix
+++ b/modules/private/databases/mariadb.nix
@@ -96,8 +96,8 @@ in {
      dataDir = cfg.dataDir;
      extraOptions = ''
        ssl_ca = ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
-        ssl_key = ${config.security.acme2.certs.mysql.directory}/key.pem
+        ssl_key = ${config.security.acme.certs.mysql.directory}/key.pem
-        ssl_cert = ${config.security.acme2.certs.mysql.directory}/fullchain.pem
+        ssl_cert = ${config.security.acme.certs.mysql.directory}/fullchain.pem
        # for replication
        log-bin=mariadb-bin
@@ -110,7 +110,7 @@ in {
    };
    users.users.mysql.extraGroups = [ "keys" ];
-    security.acme2.certs."mysql" = config.myServices.databasesCerts // {
+    security.acme.certs."mysql" = config.myServices.databasesCerts // {
      user = "mysql";
      group = "mysql";
      plugins = [ "fullchain.pem" "key.pem" "account_key.json" "account_reg.json" ];
diff --git a/modules/private/databases/openldap/default.nix b/modules/private/databases/openldap/default.nix
index d7d61db..efe9379 100644
--- a/modules/private/databases/openldap/default.nix
+++ b/modules/private/databases/openldap/default.nix
@@ -12,27 +12,14 @@ let
    moduleload      back_hdb
    backend         hdb
-    moduleload      memberof
+    TLSCertificateFile    ${config.security.acme.certs.ldap.directory}/cert.pem
-    database        hdb
+    TLSCertificateKeyFile ${config.security.acme.certs.ldap.directory}/key.pem
-    suffix          "${cfg.baseDn}"
+    TLSCACertificateFile  ${config.security.acme.certs.ldap.directory}/fullchain.pem
-    rootdn          "${cfg.rootDn}"
-    include         ${config.secrets.location}/ldap/password
-    directory       ${cfg.dataDir}
-    overlay         memberof
-    moduleload      syncprov
-    overlay         syncprov
-    syncprov-checkpoint 100 10
-    TLSCertificateFile    ${config.security.acme2.certs.ldap.directory}/cert.pem
-    TLSCertificateKeyFile ${config.security.acme2.certs.ldap.directory}/key.pem
-    TLSCACertificateFile  ${config.security.acme2.certs.ldap.directory}/fullchain.pem
    TLSCACertificatePath  ${pkgs.cacert.unbundled}/etc/ssl/certs/
    #This makes openldap crash
    #TLSCipherSuite        DEFAULT
    sasl-host kerberos.immae.eu
-    include ${config.secrets.location}/ldap/access
    '';
 in
 {
@@ -117,7 +104,7 @@ in
    users.users.openldap.extraGroups = [ "keys" ];
    networking.firewall.allowedTCPPorts = [ 636 389 ];
-    security.acme2.certs."ldap" = config.myServices.databasesCerts // {
+    security.acme.certs."ldap" = config.myServices.databasesCerts // {
      user = "openldap";
      group = "openldap";
      plugins = [ "fullchain.pem" "key.pem" "cert.pem" "account_key.json" "account_reg.json" ];
@@ -137,6 +124,20 @@ in
      dataDir = cfg.dataDir;
      urlList = [ "ldap://" "ldaps://" ];
      extraConfig = ldapConfig;
+      extraDatabaseConfig = ''
+        moduleload      memberof
+        overlay         memberof
+        moduleload      syncprov
+        overlay         syncprov
+        syncprov-checkpoint 100 10
+        include ${config.secrets.location}/ldap/access
+        '';
+      rootpwFile = "${config.secrets.location}/ldap/password";
+      suffix = cfg.baseDn;
+      rootdn = cfg.rootDn;
+      database = "hdb";
    };
  };
 }
diff --git a/modules/private/databases/openldap/eldiron_schemas.nix b/modules/private/databases/openldap/eldiron_schemas.nix
index fc686dd..cf45ebe 100644
--- a/modules/private/databases/openldap/eldiron_schemas.nix
+++ b/modules/private/databases/openldap/eldiron_schemas.nix
@@ -9,10 +9,10 @@ let
    sha256 = "11bjf5zfvqlim7p9vddcafs0wiq3v8ys77x8h6fbp9c6bdfh0awh";
  };
  schemas = [
-    "${openldap}/etc/schema/core.schema"
+    #"${openldap}/etc/schema/core.schema"
-    "${openldap}/etc/schema/cosine.schema"
+    #"${openldap}/etc/schema/cosine.schema"
-    "${openldap}/etc/schema/inetorgperson.schema"
+    #"${openldap}/etc/schema/inetorgperson.schema"
-    "${openldap}/etc/schema/nis.schema"
+    #"${openldap}/etc/schema/nis.schema"
    puppetSchema
    kerberosSchema
    ./immae.schema
diff --git a/modules/private/databases/openldap_replication.nix b/modules/private/databases/openldap_replication.nix
index 2980c97..df4101b 100644
--- a/modules/private/databases/openldap_replication.nix
+++ b/modules/private/databases/openldap_replication.nix
@@ -3,6 +3,10 @@ let
  cfg = config.myServices.databasesReplication.openldap;
  eldiron_schemas = pkgs.callPackage ./openldap/eldiron_schemas.nix {};
  ldapConfig = hcfg: name: pkgs.writeText "slapd.conf" ''
+    include ${pkgs.openldap}/etc/schema/core.schema
+    include ${pkgs.openldap}/etc/schema/cosine.schema
+    include ${pkgs.openldap}/etc/schema/inetorgperson.schema
+    include ${pkgs.openldap}/etc/schema/nis.schema
    ${eldiron_schemas}
    pidfile   /run/slapd_${name}/slapd.pid
    argsfile  /run/slapd_${name}/slapd.args
diff --git a/modules/private/databases/postgresql.nix b/modules/private/databases/postgresql.nix
index 27ea59c..d0b1a75 100644
--- a/modules/private/databases/postgresql.nix
+++ b/modules/private/databases/postgresql.nix
@@ -91,23 +91,13 @@ in {
          '';
        readOnly = true;
      };
-      systemdRuntimeDirectory = lib.mkOption {
-        type = lib.types.str;
-        # Use ReadWritePaths= instead if socketsDir is outside of /run
-        default = assert lib.strings.hasPrefix "/run/" cfg.socketsDir;
-          lib.strings.removePrefix "/run/" cfg.socketsDir;
-        description = ''
-        Adjusted Postgresql sockets directory for systemd
-        '';
-        readOnly = true;
-      };
    };
  };
  config = lib.mkIf cfg.enable {
    networking.firewall.allowedTCPPorts = [ 5432 ];
-    security.acme2.certs."postgresql" = config.myServices.databasesCerts // {
+    security.acme.certs."postgresql" = config.myServices.databasesCerts // {
      user = "postgres";
      group = "postgres";
      plugins = [ "fullchain.pem" "key.pem" "account_key.json" "account_reg.json" ];
@@ -119,7 +109,6 @@ in {
    systemd.services.postgresql.serviceConfig = {
      SupplementaryGroups = "keys";
-      RuntimeDirectory = cfg.systemdRuntimeDirectory;
    };
    systemd.services.postgresql.postStart = lib.mkAfter ''
      # This line is already defined in 19.09
@@ -165,8 +154,8 @@ in {
        # makes it order of magnitudes quicker
        synchronous_commit = off
        ssl = on
-        ssl_cert_file = '${config.security.acme2.certs.postgresql.directory}/fullchain.pem'
+        ssl_cert_file = '${config.security.acme.certs.postgresql.directory}/fullchain.pem'
-        ssl_key_file = '${config.security.acme2.certs.postgresql.directory}/key.pem'
+        ssl_key_file = '${config.security.acme.certs.postgresql.directory}/key.pem'
        '';
      authentication = let
        hosts = builtins.concatStringsSep "\n" (
diff --git a/modules/private/databases/redis.nix b/modules/private/databases/redis.nix
index 4b26283..4602510 100644
--- a/modules/private/databases/redis.nix
+++ b/modules/private/databases/redis.nix
@@ -17,16 +17,6 @@ in {
        '';
    };
    # Output variables
-    systemdRuntimeDirectory = lib.mkOption {
-      type = lib.types.str;
-      # Use ReadWritePaths= instead if socketsDir is outside of /run
-      default = assert lib.strings.hasPrefix "/run/" cfg.socketsDir;
-        lib.strings.removePrefix "/run/" cfg.socketsDir;
-      description = ''
-      Adjusted redis sockets directory for systemd
-      '';
-      readOnly = true;
-    };
    sockets = lib.mkOption {
      type = lib.types.attrsOf lib.types.path;
      default = {
@@ -51,7 +41,6 @@ in {
        maxclients 1024
        '';
    };
-    systemd.services.redis.serviceConfig.RuntimeDirectory = cfg.systemdRuntimeDirectory;
    services.spiped = {
      enable = true;
diff --git a/modules/private/ejabberd/default.nix b/modules/private/ejabberd/default.nix
index 3537c24..382b42d 100644
--- a/modules/private/ejabberd/default.nix
+++ b/modules/private/ejabberd/default.nix
@@ -14,7 +14,7 @@ in
  };
  config = lib.mkIf cfg.enable {
-    security.acme2.certs = {
+    security.acme.certs = {
      "ejabberd" = config.myServices.certificates.certConfig // {
        user = "ejabberd";
        group = "ejabberd";
@@ -58,7 +58,7 @@ in
        text = ''
          host_config:
            "immae.fr":
-              domain_certfile: "${config.security.acme2.certs.ejabberd.directory}/full.pem"
+              domain_certfile: "${config.security.acme.certs.ejabberd.directory}/full.pem"
              auth_method: [ldap]
              ldap_servers: ["${config.myEnv.jabber.ldap.host}"]
              ldap_encrypt: tls
@@ -66,8 +66,8 @@ in
              ldap_password: "${config.myEnv.jabber.ldap.password}"
              ldap_base: "${config.myEnv.jabber.ldap.base}"
              ldap_uids:
-                - "uid": "%u"
+                uid: "%u"
-                - "immaeXmppUid": "%u"
+                immaeXmppUid: "%u"
              ldap_filter: "${config.myEnv.jabber.ldap.filter}"
          '';
      }
@@ -81,7 +81,7 @@ in
        ERLANG_NODE=ejabberd@localhost
      '';
      configFile = pkgs.runCommand "ejabberd.yml" {
-        certificatePrivateKeyAndFullChain = "${config.security.acme2.certs.ejabberd.directory}/full.pem";
+        certificatePrivateKeyAndFullChain = "${config.security.acme.certs.ejabberd.directory}/full.pem";
        certificateCA = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
        sql_config_file = config.secrets.fullPaths."ejabberd/psql.yml";
        host_config_file = config.secrets.fullPaths."ejabberd/host.yml";
diff --git a/modules/private/ejabberd/ejabberd.yml b/modules/private/ejabberd/ejabberd.yml
index 0f678b6..82ac35b 100644
--- a/modules/private/ejabberd/ejabberd.yml
+++ b/modules/private/ejabberd/ejabberd.yml
@@ -69,7 +69,6 @@ s2s_use_starttls: optional
 s2s_cafile: "@certificateCA@"
 default_db: sql
-sql_type: pgsql
 include_config_file: @sql_config_file@
 include_config_file: @host_config_file@
 new_sql_schema: true
@@ -193,7 +192,6 @@ modules:
    access_createnode: pubsub_createnode
    plugins:
      - "flat"
-      - "hometree"
      - "pep"
    force_node_config:
      ## Change from "whitelist" to "open" to enable OMEMO support
diff --git a/modules/private/environment.nix b/modules/private/environment.nix
index b7589eb..77e9c8d 100644
--- a/modules/private/environment.nix
+++ b/modules/private/environment.nix
@@ -133,8 +133,8 @@ let
        '';
        type = submodule {
          options = {
-            password = mkOption { type = string; description = "Password for the LDAP connection"; };
+            password = mkOption { type = str; description = "Password for the LDAP connection"; };
-            dn = mkOption { type = string; description = "DN for the LDAP connection"; };
+            dn = mkOption { type = str; description = "DN for the LDAP connection"; };
          };
        };
      };
@@ -156,13 +156,13 @@ let
        type = attrsOf (submodule {
          options = {
            ip4 = mkOption {
-              type = string;
+              type = str;
              description = ''
                ip4 address of the host
              '';
            };
            ip6 = mkOption {
-              type = listOf string;
+              type = listOf str;
              default = [];
              description = ''
                ip6 addresses of the host
diff --git a/modules/private/ftp.nix b/modules/private/ftp.nix
index 585fe63..417af87 100644
--- a/modules/private/ftp.nix
+++ b/modules/private/ftp.nix
@@ -17,7 +17,7 @@ in
    services.duplyBackup.profiles.ftp = {
      rootDir = "/var/lib/ftp";
    };
-    security.acme2.certs."ftp" = config.myServices.certificates.certConfig // {
+    security.acme.certs."ftp" = config.myServices.certificates.certConfig // {
      domain = "eldiron.immae.eu";
      postRun = ''
        systemctl restart pure-ftpd.service
@@ -113,7 +113,7 @@ in
        MaxDiskUsage                 99
        CustomerProof                yes
        TLS                          1
-        CertFile                     ${config.security.acme2.certs.ftp.directory}/full.pem
+        CertFile                     ${config.security.acme.certs.ftp.directory}/full.pem
        '';
    in {
      description = "Pure-FTPd server";
diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix
index 9dfa04d..9f5c179 100644
--- a/modules/private/gitolite/default.nix
+++ b/modules/private/gitolite/default.nix
@@ -5,7 +5,7 @@ in {
  options.myServices.gitolite = {
    enable = lib.mkEnableOption "my gitolite service";
    gitoliteDir = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
      default = "/var/lib/gitolite";
    };
  };
diff --git a/modules/private/irc.nix b/modules/private/irc.nix
index 1054b96..9871508 100644
--- a/modules/private/irc.nix
+++ b/modules/private/irc.nix
@@ -20,7 +20,7 @@ in
    services.duplyBackup.profiles.irc = {
      rootDir = "/var/lib/bitlbee";
    };
-    security.acme2.certs."irc" = config.myServices.ircCerts // {
+    security.acme.certs."irc" = config.myServices.ircCerts // {
      domain = "irc.immae.eu";
      postRun = ''
        systemctl restart stunnel.service
@@ -49,7 +49,7 @@ in
        bitlbee = {
          accept = 6697;
          connect = 6667;
-          cert = "${config.security.acme2.certs.irc.directory}/full.pem";
+          cert = "${config.security.acme.certs.irc.directory}/full.pem";
        };
      };
    };
diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix
index 1c64e15..b50e346 100644
--- a/modules/private/mail/default.nix
+++ b/modules/private/mail/default.nix
@@ -13,7 +13,7 @@
  options.myServices.mailBackup.enable = lib.mkEnableOption "enable MX backup services";
  config = lib.mkIf config.myServices.mail.enable {
-    security.acme2.certs."mail" = config.myServices.certificates.certConfig // {
+    security.acme.certs."mail" = config.myServices.certificates.certConfig // {
      domain = config.hostEnv.fqdn;
      extraDomains = let
        zonesWithMx = builtins.filter (zone:
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix
index 9836f78..77f9bd7 100644
--- a/modules/private/mail/dovecot.nix
+++ b/modules/private/mail/dovecot.nix
@@ -269,7 +269,7 @@ in
      [
        "0 2 * * * root ${cron_script}/bin/cleanup-imap-folders"
      ];
-    security.acme2.certs."mail" = {
+    security.acme.certs."mail" = {
      postRun = ''
        systemctl restart dovecot2.service
      '';
diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index e0347ec..4791b41 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -428,7 +428,7 @@
        };
      };
    };
-    security.acme2.certs."mail" = {
+    security.acme.certs."mail" = {
      postRun = ''
        systemctl restart postfix.service
        '';
diff --git a/modules/private/mail/relay.nix b/modules/private/mail/relay.nix
index 18d6bc3..c6231aa 100644
--- a/modules/private/mail/relay.nix
+++ b/modules/private/mail/relay.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, config, nodes, name, ... }:
 {
  config = lib.mkIf config.myServices.mailBackup.enable {
-    security.acme2.certs."mail" = config.myServices.certificates.certConfig // {
+    security.acme.certs."mail" = config.myServices.certificates.certConfig // {
      postRun = ''
        systemctl restart postfix.service
        '';
diff --git a/modules/private/monitoring/objects_backup-2.nix b/modules/private/monitoring/objects_backup-2.nix
index cc8e36b..4cdf59a 100644
--- a/modules/private/monitoring/objects_backup-2.nix
+++ b/modules/private/monitoring/objects_backup-2.nix
@@ -79,6 +79,10 @@ in
        base = config.myServices.databasesReplication.openldap.base;
        eldiron_schemas = pkgs.callPackage ../databases/openldap/eldiron_schemas.nix {};
        ldapConfig = pkgs.writeText "slapd.conf" ''
+          include ${pkgs.openldap}/etc/schema/core.schema
+          include ${pkgs.openldap}/etc/schema/cosine.schema
+          include ${pkgs.openldap}/etc/schema/inetorgperson.schema
+          include ${pkgs.openldap}/etc/schema/nis.schema
          ${eldiron_schemas}
          moduleload  back_hdb
          backend     hdb
diff --git a/modules/private/monitoring/status.nix b/modules/private/monitoring/status.nix
index 2860e96..d25d934 100644
--- a/modules/private/monitoring/status.nix
+++ b/modules/private/monitoring/status.nix
@@ -34,7 +34,7 @@
        locations."/".proxyPass = "http://unix:/run/naemon-status/socket.sock:/";
      };
    };
-    security.acme2.certs."${name}".extraDomains."status.immae.eu" = null;
+    security.acme.certs."${name}".extraDomains."status.immae.eu" = null;
    myServices.certificates.enable = true;
    networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/modules/private/tasks/default.nix b/modules/private/tasks/default.nix
index 78e07c1..42cc8d2 100644
--- a/modules/private/tasks/default.nix
+++ b/modules/private/tasks/default.nix
@@ -123,7 +123,7 @@ in {
          Use LDAPConnect
          Require ldap-group cn=users,cn=taskwarrior,ou=services,dc=immae,dc=eu
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/var/run/phpfpm/task.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.tasks.socket}|fcgi://localhost"
          </FilesMatch>
          Include /var/secrets/webapps/tools-taskwarrior-web
        </Directory>
@@ -172,29 +172,30 @@ in {
    };
    services.phpfpm.pools = {
      tasks = {
-        listen = "/var/run/phpfpm/task.sock";
+        user = user;
-        extraConfig = ''
+        group = group;
-          user = ${user}
+        settings = {
-          group = ${group}
+          "listen.owner" = "wwwrun";
-          listen.owner = wwwrun
+          "listen.group" = "wwwrun";
-          listen.group = wwwrun
+          "pm" = "dynamic";
-          pm = dynamic
+          "pm.max_children" = "60";
-          pm.max_children = 60
+          "pm.start_servers" = "2";
-          pm.start_servers = 2
+          "pm.min_spare_servers" = "1";
-          pm.min_spare_servers = 1
+          "pm.max_spare_servers" = "10";
-          pm.max_spare_servers = 10
-          ; Needed to avoid clashes in browser cookies (same domain)
+          # Needed to avoid clashes in browser cookies (same domain)
-          env[PATH] = "/etc/profiles/per-user/${user}/bin"
+          "php_value[session.name]" = "TaskPHPSESSID";
-          php_value[session.name] = TaskPHPSESSID
+          "php_admin_value[open_basedir]" = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/";
-          php_admin_value[open_basedir] = "${./www}:/tmp:${server_vardir}:/etc/profiles/per-user/${user}/bin/"
+        };
-        '';
+        phpEnv = {
+          PATH = "/etc/profiles/per-user/${user}/bin";
+        };
      };
    };
    myServices.websites.webappDirs._task = ./www;
-    security.acme2.certs."task" = config.myServices.certificates.certConfig // {
+    security.acme.certs."task" = config.myServices.certificates.certConfig // {
      inherit user group;
      plugins = [ "fullchain.pem" "key.pem" "cert.pem" "account_key.json" "account_reg.json" ];
      domain = fqdn;
@@ -246,9 +247,9 @@ in {
      inherit fqdn;
      listenHost = "::";
      pki.manual.ca.cert = "${server_vardir}/keys/ca.cert";
-      pki.manual.server.cert = "${config.security.acme2.certs.task.directory}/fullchain.pem";
+      pki.manual.server.cert = "${config.security.acme.certs.task.directory}/fullchain.pem";
-      pki.manual.server.crl = "${config.security.acme2.certs.task.directory}/invalid.crl";
+      pki.manual.server.crl = "${config.security.acme.certs.task.directory}/invalid.crl";
-      pki.manual.server.key = "${config.security.acme2.certs.task.directory}/key.pem";
+      pki.manual.server.key = "${config.security.acme.certs.task.directory}/key.pem";
      requestLimit = 104857600;
    };
diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix
index f21caeb..bce2b4d 100644
--- a/modules/private/websites/chloe/builder.nix
+++ b/modules/private/websites/chloe/builder.nix
@@ -3,28 +3,25 @@ rec {
  app = chloe.override { inherit (config) environment; };
  phpFpm = rec {
    serviceDeps = [ "mysql.service" ];
-    socket = "/var/run/phpfpm/chloe-${app.environment}.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apacheUser;
-      user = ${apacheUser}
+      "listen.group" = apacheGroup;
-      group = ${apacheGroup}
+      "php_admin_value[upload_max_filesize]" = "20M";
-      listen.owner = ${apacheUser}
+      "php_admin_value[post_max_size]" = "20M";
-      listen.group = ${apacheGroup}
+      # "php_admin_flag[log_errors]" = "on";
-      php_admin_value[upload_max_filesize] = 20M
+      "php_admin_value[open_basedir]" = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp";
-      php_admin_value[post_max_size] = 20M
+      "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions";
-      ;php_admin_flag[log_errors] = on
+    } // (if app.environment == "dev" then {
-      php_admin_value[open_basedir] = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp"
+      "pm" = "ondemand";
-      php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
+      "pm.max_children" = "5";
-      ${if app.environment == "dev" then ''
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
+    } else {
-      pm.max_children = 5
+      "pm" = "dynamic";
-      pm.process_idle_timeout = 60
+      "pm.max_children" = "20";
-      '' else ''
+      "pm.start_servers" = "2";
-      pm = dynamic
+      "pm.min_spare_servers" = "1";
-      pm.max_children = 20
+      "pm.max_spare_servers" = "3";
-      pm.start_servers = 2
+    });
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 3
-      ''}'';
  };
  keys = [{
    dest = "webapps/${app.environment}-chloe";
@@ -51,7 +48,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "chloe_${app.environment}";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Include /var/secrets/webapps/${app.environment}-chloe
      RewriteEngine On
@@ -60,7 +57,7 @@ rec {
      '' else ""}
      <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        SetHandler "proxy:unix:${socket}|fcgi://localhost"
      </FilesMatch>
      <Directory ${root}>
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 6276eb7..caf6548 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -17,8 +17,9 @@ in {
    systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps;
    systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps;
    services.phpfpm.pools.chloe_dev = {
-      listen = chloe.phpFpm.socket;
+      user = config.services.httpd.Inte.user;
-      extraConfig = chloe.phpFpm.pool;
+      group = config.services.httpd.Inte.group;
+      settings = chloe.phpFpm.pool;
      phpOptions = config.services.phpfpm.phpOptions + ''
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
      '';
@@ -31,7 +32,9 @@ in {
      addToCerts  = true;
      hosts       = ["chloe.immae.eu" ];
      root        = chloe.apache.root;
-      extraConfig = [ chloe.apache.vhostConf ];
+      extraConfig = [
+        (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_dev.socket)
+      ];
    };
    services.websites.env.integration.watchPaths = [
      "/var/secrets/webapps/${chloe.app.environment}-chloe"
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 578bf91..83f6c9b 100644
--- a/modules/private/websites/chloe/production.nix
+++ b/modules/private/websites/chloe/production.nix
@@ -19,8 +19,9 @@ in {
    systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps;
    systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps;
    services.phpfpm.pools.chloe_prod = {
-      listen = chloe.phpFpm.socket;
+      user = config.services.httpd.Prod.user;
-      extraConfig = chloe.phpFpm.pool;
+      group = config.services.httpd.Prod.group;
+      settings = chloe.phpFpm.pool;
      phpOptions = config.services.phpfpm.phpOptions + ''
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
      '';
@@ -39,7 +40,7 @@ in {
          RewriteCond "%{HTTP_HOST}" "!^www\.osteopathe-cc\.fr$" [NC]
          RewriteRule ^(.+)$ https://www.osteopathe-cc.fr$1 [R=302,L]
          ''
-        chloe.apache.vhostConf
+        (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_prod.socket)
      ];
    };
    services.websites.env.production.watchPaths = [
diff --git a/modules/private/websites/commons/adminer.nix b/modules/private/websites/commons/adminer.nix
index d591c90..1803468 100644
--- a/modules/private/websites/commons/adminer.nix
+++ b/modules/private/websites/commons/adminer.nix
@@ -1,24 +1,5 @@
-{}:
+{ config, callPackage }:
-rec {
+callPackage ../tools/tools/adminer.nix {
-  phpFpm = {
+  adminer = null;
-    socket = "/var/run/phpfpm/adminer.sock";
+  forcePhpSocket = config.services.phpfpm.pools.adminer.socket;
-  };
-  apache = rec {
-    modules = [ "proxy_fcgi" ];
-    webappName = "_adminer";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
-      Alias /adminer ${root}
-      <Directory ${root}>
-        DirectoryIndex index.php
-        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-        </FilesMatch>
-        Use LDAPConnect
-        Require ldap-group cn=users,cn=mysql,cn=pam,ou=services,dc=immae,dc=eu
-        Require ldap-group cn=users,cn=postgresql,cn=pam,ou=services,dc=immae,dc=eu
-      </Directory>
-      '';
-  };
 }
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index 81cff8f..4f7b72d 100644
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -25,15 +25,17 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" "/run/wrappers/bin/sendmail" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[SYMFONY_DEBUG_MODE] = "yes"
+        };
-      '';
+      phpEnv = {
+        SYMFONY_DEBUG_MODE = "yes";
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-connexionswing"
      ];
diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix
index fa31931..0b52af1 100644
--- a/modules/private/websites/connexionswing/production.nix
+++ b/modules/private/websites/connexionswing/production.nix
@@ -26,16 +26,16 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" "/run/wrappers/bin/sendmail" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = dynamic
+        "pm" = "dynamic";
-        pm.max_children = 20
+        "pm.max_children" = "20";
-        pm.start_servers = 2
+        "pm.start_servers" = "2";
-        pm.min_spare_servers = 1
+        "pm.min_spare_servers" = "1";
-        pm.max_spare_servers = 3
+        "pm.max_spare_servers" = "3";
-      '';
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-connexionswing"
      ];
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix
index 5c0e655..529ec5c 100644
--- a/modules/private/websites/default.nix
+++ b/modules/private/websites/default.nix
@@ -87,9 +87,9 @@ in
      #openssl = self.openssl_1_1;
      php = php72;
      php72 = (super.php72.override {
-        mysql.connector-c = self.mariadb;
+        config.php.mysqlnd = true;
-        config.php.mysqlnd = false;
        config.php.mysqli = false;
+        config.php.mhash = true; # Is it needed?
      }).overrideAttrs(old: rec {
        # Didn't manage to build with mysqli + mysql_config connector
        configureFlags = old.configureFlags ++ [
@@ -140,9 +140,9 @@ in
        ; 30 days (minutes)
        session.cache_expire = 43200
        '';
-      extraConfig = ''
+      settings = {
-        log_level = notice
+        log_level = "notice";
-        '';
+      };
    };
    services.filesWatcher.httpdProd.paths = [ "/var/secrets/apache-ldap" ];
diff --git a/modules/private/websites/emilia/richie.nix b/modules/private/websites/emilia/richie.nix
index f7b4f8d..98ab1cd 100644
--- a/modules/private/websites/emilia/richie.nix
+++ b/modules/private/websites/emilia/richie.nix
@@ -49,22 +49,23 @@ in
        '';
    };
    services.phpfpm.pools.richie_production = {
-      listen = "/run/phpfpm/richie_production.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[PATH] = /run/current-system/sw/bin:${lib.makeBinPath [ pkgs.imagemagick ]}
+        "php_admin_value[open_basedir]" = "${vardir}:/var/lib/php/sessions/richie_production:/var/secrets/webapps/prod-richie:${richieSrc}:/tmp";
-        env[BDD_CONNECT] = "/var/secrets/webapps/prod-richie"
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/richie_production";
-        php_admin_value[open_basedir] = "${vardir}:/var/lib/php/sessions/richie_production:/var/secrets/webapps/prod-richie:${richieSrc}:/tmp"
+      };
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/richie_production"
+      phpEnv = {
-        '';
+        PATH = "/run/current-system/sw/bin:${lib.makeBinPath [ pkgs.imagemagick ]}";
+        BDD_CONNECT = "/var/secrets/webapps/prod-richie";
+      };
      phpOptions = config.services.phpfpm.phpOptions + ''
        date.timezone = 'Europe/Paris'
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -91,7 +92,7 @@ in
          Require all granted
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/richie_production.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.richie_production.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
          ''
diff --git a/modules/private/websites/evariste/production.nix b/modules/private/websites/evariste/production.nix
index 00e6fe1..43b26c8 100644
--- a/modules/private/websites/evariste/production.nix
+++ b/modules/private/websites/evariste/production.nix
@@ -21,20 +21,19 @@ in {
        '';
    };
    services.phpfpm.pools.nsievariste = {
-      listen = "/run/phpfpm/nsievariste.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        php_admin_value[open_basedir] = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp"
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp";
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/nsievariste"
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/nsievariste";
-        '';
+      };
    };
    services.websites.env.production.vhostConfs.nsievariste = {
      certName     = "eldiron";
@@ -46,7 +45,7 @@ in {
        Use Stats nsievariste.immae.eu
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/nsievariste.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.nsievariste.socket}|fcgi://localhost"
        </FilesMatch>
        <Directory ${nsiVarDir}>
@@ -60,20 +59,19 @@ in {
    };
    services.phpfpm.pools.stmgevariste = {
-      listen = "/run/phpfpm/stmgevariste.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        php_admin_value[open_basedir] = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp"
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp";
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/stmgevariste"
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/stmgevariste";
-        '';
+      };
    };
    services.websites.env.production.vhostConfs.stmgevariste = {
      certName     = "eldiron";
@@ -85,7 +83,7 @@ in {
        Use Stats stmgevariste.immae.eu
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/stmgevariste.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.stmgevariste.socket}|fcgi://localhost"
        </FilesMatch>
        <Directory ${stmgVarDir}>
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index e262c59..c65c26f 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-  adminer = pkgs.callPackage ../commons/adminer.nix {};
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
  secrets = config.myEnv.websites.tellesflorian.integration;
  app = pkgs.webapps.tellesflorian.override { environment = secrets.environment; };
  cfg = config.myServices.websites.florian.app;
@@ -24,15 +24,17 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[SYMFONY_DEBUG_MODE] = "yes"
+      };
-      '';
+      phpEnv = {
+        SYMFONY_DEBUG_MODE = "yes";
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-tellesflorian"
      ];
@@ -134,7 +136,7 @@ in {
        </Directory>
        ''
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
      ];
    };
  };
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 57c4006..4ee160a 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
    cfg = config.myServices.websites.florian.integration;
    varDir = "/var/lib/ftp/florian";
    env = config.myEnv.websites.florian;
@@ -8,7 +8,7 @@ in {
  options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
  config = lib.mkIf cfg.enable {
-    security.acme2.certs."ftp".extraDomains."florian.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
    services.websites.env.integration.modules = adminer.apache.modules;
    services.websites.env.integration.vhostConfs.florian = {
@@ -17,7 +17,7 @@ in {
      hosts       = [ "florian.immae.eu" ];
      root        = "${varDir}/florian.immae.eu";
      extraConfig = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
        ''
        ServerAdmin ${env.server_admin}
diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 1abc715..16c6022 100644
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
    cfg = config.myServices.websites.florian.production;
    varDir = "/var/lib/ftp/florian";
    env = config.myEnv.websites.florian;
@@ -8,7 +8,7 @@ in {
  options.myServices.websites.florian.production.enable = lib.mkEnableOption "enable Florian's website production";
  config = lib.mkIf cfg.enable {
-    security.acme2.certs."ftp".extraDomains."tellesflorian.com" = null;
+    security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
    services.websites.env.production.modules = adminer.apache.modules;
    services.websites.env.production.vhostConfs.florian = {
@@ -17,7 +17,7 @@ in {
      hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
      root         = "${varDir}/tellesflorian.com";
      extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
        ''
        ServerAdmin ${env.server_admin}
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index a2a087c..fb6eda9 100644
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -23,15 +23,17 @@ in {
        "APP_ENV=${app.environment} ./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[SYMFONY_DEBUG_MODE] = "yes"
+      };
-      '';
+      phpEnv = {
+        SYMFONY_DEBUG_MODE = "yes";
+      };
    };
    secrets.keys = [{
diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix
index 8e33f0f..cf7e4a2 100644
--- a/modules/private/websites/isabelle/aten_production.nix
+++ b/modules/private/websites/isabelle/aten_production.nix
@@ -24,16 +24,16 @@ in {
        "APP_ENV=${app.environment} ./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = dynamic
+        "pm" = "dynamic";
-        pm.max_children = 20
+        "pm.max_children" = "20";
-        pm.start_servers = 2
+        "pm.start_servers" = "2";
-        pm.min_spare_servers = 1
+        "pm.min_spare_servers" = "1";
-        pm.max_spare_servers = 3
+        "pm.max_spare_servers" = "3";
-      '';
+      };
    };
    secrets.keys = [{
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 460bd2a..ffbf259 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -19,8 +19,9 @@ in {
    systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps;
    systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps;
    services.phpfpm.pools.iridologie = {
-      listen = iridologie.phpFpm.socket;
+      user = config.services.httpd.Prod.user;
-      extraConfig = iridologie.phpFpm.pool;
+      group = config.services.httpd.Prod.group;
+      settings = iridologie.phpFpm.pool;
      phpOptions = config.services.phpfpm.phpOptions + ''
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
      '';
@@ -39,7 +40,7 @@ in {
          RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC]
          RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L]
          ''
-        iridologie.apache.vhostConf
+        (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket)
      ];
    };
    services.websites.env.production.watchPaths = [
diff --git a/modules/private/websites/isabelle/spip_builder.nix b/modules/private/websites/isabelle/spip_builder.nix
index 2ab5394..e1130d1 100644
--- a/modules/private/websites/isabelle/spip_builder.nix
+++ b/modules/private/websites/isabelle/spip_builder.nix
@@ -3,28 +3,25 @@ rec {
  app = iridologie.override { inherit (config) environment; };
  phpFpm = rec {
    serviceDeps = [ "mysql.service" ];
-    socket = "/var/run/phpfpm/iridologie-${app.environment}.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = "${apacheUser}";
-      user = ${apacheUser}
+      "listen.group" = "${apacheGroup}";
-      group = ${apacheGroup}
+      "php_admin_value[upload_max_filesize]" = "20M";
-      listen.owner = ${apacheUser}
+      "php_admin_value[post_max_size]" = "20M";
-      listen.group = ${apacheGroup}
+      #"php_admin_flag[log_errors]" = "on";
-      php_admin_value[upload_max_filesize] = 20M
+      "php_admin_value[open_basedir]" = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp";
-      php_admin_value[post_max_size] = 20M
+      "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions";
-      ;php_admin_flag[log_errors] = on
+    } // (if app.environment == "dev" then {
-      php_admin_value[open_basedir] = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp"
+      "pm" = "ondemand";
-      php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
+      "pm.max_children" = "5";
-      ${if app.environment == "dev" then ''
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
+    } else {
-      pm.max_children = 5
+      "pm" = "dynamic";
-      pm.process_idle_timeout = 60
+      "pm.max_children" = "20";
-      '' else ''
+      "pm.start_servers" = "2";
-      pm = dynamic
+      "pm.min_spare_servers" = "1";
-      pm.max_children = 20
+      "pm.max_spare_servers" = "3";
-      pm.start_servers = 2
+    });
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 3
-      ''}'';
  };
  keys = [{
    dest = "webapps/${app.environment}-iridologie";
@@ -51,13 +48,13 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "iridologie_${app.environment}";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Include /var/secrets/webapps/${app.environment}-iridologie
      RewriteEngine On
      <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        SetHandler "proxy:unix:${socket}|fcgi://localhost"
      </FilesMatch>
      <Directory ${root}>
diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix
index e8591c8..3b289cf 100644
--- a/modules/private/websites/leila/production.nix
+++ b/modules/private/websites/leila/production.nix
@@ -7,19 +7,18 @@ in {
  config = lib.mkIf cfg.enable {
    services.phpfpm.pools.leila = {
-      listen = "/run/phpfpm/leila.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        php_admin_value[open_basedir] = "${varDir}:/tmp"
+        "php_admin_value[open_basedir]" = "${varDir}:/tmp";
-      '';
+      };
    };
    services.webstats.sites = [
@@ -46,7 +45,7 @@ in {
          Require ldap-group cn=chorale.leila.bouya.org,cn=httpd,ou=services,dc=immae,dc=eu
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/leila.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
          ''
@@ -66,7 +65,7 @@ in {
          AllowOverride None
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/leila.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
          ''
@@ -89,7 +88,7 @@ in {
          Require ldap-group cn=chorale.leila.bouya.org,cn=httpd,ou=services,dc=immae,dc=eu
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/leila.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
        <Directory ${varDir}>
diff --git a/modules/private/websites/ludivinecassal/integration.nix b/modules/private/websites/ludivinecassal/integration.nix
index 1cbfd12..d304fdf 100644
--- a/modules/private/websites/ludivinecassal/integration.nix
+++ b/modules/private/websites/ludivinecassal/integration.nix
@@ -23,15 +23,17 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[SYMFONY_DEBUG_MODE] = "yes"
+      };
-      '';
+      phpEnv = {
+        SYMFONY_DEBUG_MODE = "yes";
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-ludivinecassal"
      ];
diff --git a/modules/private/websites/ludivinecassal/production.nix b/modules/private/websites/ludivinecassal/production.nix
index 7cf00f0..5761be7 100644
--- a/modules/private/websites/ludivinecassal/production.nix
+++ b/modules/private/websites/ludivinecassal/production.nix
@@ -24,16 +24,16 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        pm = dynamic
+        "pm" = "dynamic";
-        pm.max_children = 20
+        "pm.max_children" = "20";
-        pm.start_servers = 2
+        "pm.start_servers" = "2";
-        pm.min_spare_servers = 1
+        "pm.min_spare_servers" = "1";
-        pm.max_spare_servers = 3
+        "pm.max_spare_servers" = "3";
-      '';
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-ludivinecassal"
      ];
diff --git a/modules/private/websites/nassime/production.nix b/modules/private/websites/nassime/production.nix
index 293519f..f9468f9 100644
--- a/modules/private/websites/nassime/production.nix
+++ b/modules/private/websites/nassime/production.nix
@@ -9,7 +9,7 @@ in {
  config = lib.mkIf cfg.enable {
    services.webstats.sites = [ { name = "nassime.bouya.org"; } ];
-    security.acme2.certs."ftp".extraDomains."nassime.bouya.org" = null;
+    security.acme.certs."ftp".extraDomains."nassime.bouya.org" = null;
    services.websites.env.production.vhostConfs.nassime = {
      certName     = "nassime";
diff --git a/modules/private/websites/naturaloutil/production.nix b/modules/private/websites/naturaloutil/production.nix
index a276c47..1e79141 100644
--- a/modules/private/websites/naturaloutil/production.nix
+++ b/modules/private/websites/naturaloutil/production.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-  adminer = pkgs.callPackage ../commons/adminer.nix {};
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
  cfg = config.myServices.websites.naturaloutil.production;
  varDir = "/var/lib/ftp/jerome";
  env = config.myEnv.websites.jerome;
@@ -10,7 +10,7 @@ in {
  config = lib.mkIf cfg.enable {
    services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
-    security.acme2.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
    secrets.keys = [{
      dest = "webapps/prod-naturaloutil";
@@ -42,21 +42,22 @@ in {
    systemd.services.phpfpm-jerome.after = lib.mkAfter [ "mysql.service" ];
    systemd.services.phpfpm-jerome.wants = [ "mysql.service" ];
    services.phpfpm.pools.jerome = {
-      listen = "/run/phpfpm/naturaloutil.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        env[BDD_CONNECT] = "/var/secrets/webapps/prod-naturaloutil"
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/naturaloutil:/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp";
-        php_admin_value[open_basedir] = "/var/lib/php/sessions/naturaloutil:/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp"
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/naturaloutil";
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/naturaloutil"
+      };
-        '';
+      phpEnv = {
+        BDD_CONNECT = "/var/secrets/webapps/prod-naturaloutil";
+      };
      phpOptions = config.services.phpfpm.phpOptions + ''
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
        '';
@@ -68,7 +69,7 @@ in {
      hosts        = ["naturaloutil.immae.eu" ];
      root         = varDir;
      extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
        ''
        Use Stats naturaloutil.immae.eu
        ServerAdmin ${env.server_admin}
@@ -76,7 +77,7 @@ in {
        CustomLog "${varDir}/logs/access_log" combined
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/naturaloutil.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.jerome.socket}|fcgi://localhost"
        </FilesMatch>
        <Directory ${varDir}/logs>
diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index eb61b6d..11e7937 100644
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -9,19 +9,18 @@ in {
    services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
    services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
    services.phpfpm.pools.papa_maison_bbc = {
-      listen = "/run/phpfpm/papa_maison_bbc.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        php_admin_value[open_basedir] = "${varDir}"
+        "php_admin_value[open_basedir]" = varDir;
-        '';
+      };
      phpOptions = config.services.phpfpm.phpOptions + ''
        date.timezone = 'Europe/Paris'
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -34,17 +33,17 @@ in {
      root         = varDir;
      extraConfig  = [
        ''
-        Alias /.well-known/acme-challenge ${config.security.acme2.certs.papa.webroot}/.well-known/acme-challenge
+        Alias /.well-known/acme-challenge ${config.security.acme.certs.papa.webroot}/.well-known/acme-challenge
        RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
        <Directory ${varDir}>
          DirectoryIndex index.php index.htm index.html
          AllowOverride None
          Require all granted
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
-        <Directory "${config.security.acme2.certs.papa.webroot}">
+        <Directory "${config.security.acme.certs.papa.webroot}">
          Options Indexes FollowSymLinks
          AllowOverride None
          Require all granted
@@ -64,7 +63,7 @@ in {
          AllowOverride None
          Require all granted
          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
+            SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
          </FilesMatch>
        </Directory>
          ''
diff --git a/modules/private/websites/papa/surveillance.nix b/modules/private/websites/papa/surveillance.nix
index f6e1772..1bb6ac8 100644
--- a/modules/private/websites/papa/surveillance.nix
+++ b/modules/private/websites/papa/surveillance.nix
@@ -6,7 +6,7 @@ in {
  options.myServices.websites.papa.surveillance.enable = lib.mkEnableOption "enable Papa surveillance's website";
  config = lib.mkIf cfg.enable {
-    security.acme2.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
+    security.acme.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
    services.cron = {
      systemCronJobs = let
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index 5907bc8..76523ed 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -23,16 +23,18 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        env[PATH] = ${lib.makeBinPath [ pkgs.apg pkgs.unzip ]}
+        "pm" = "ondemand";
-        pm = ondemand
+        "pm.max_children" = "5";
-        pm.max_children = 5
+        "pm.process_idle_timeout" = "60";
-        pm.process_idle_timeout = 60
+      };
-        env[SYMFONY_DEBUG_MODE] = "yes"
+      phpEnv = {
-      '';
+        PATH = lib.makeBinPath [ pkgs.apg pkgs.unzip ];
+        SYMFONY_DEBUG_MODE = "yes";
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-piedsjaloux"
      ];
diff --git a/modules/private/websites/piedsjaloux/production.nix b/modules/private/websites/piedsjaloux/production.nix
index e4e29c7..d3e5c2b 100644
--- a/modules/private/websites/piedsjaloux/production.nix
+++ b/modules/private/websites/piedsjaloux/production.nix
@@ -24,17 +24,19 @@ in {
        "./bin/console --env=${app.environment} cache:clear --no-warmup"
      ];
      phpOpenbasedir = [ "/tmp" ];
-      phpPool = ''
+      phpPool = {
-        php_admin_value[upload_max_filesize] = 20M
+        "php_admin_value[upload_max_filesize]" = "20M";
-        php_admin_value[post_max_size] = 20M
+        "php_admin_value[post_max_size]" = "20M";
-        ;php_admin_flag[log_errors] = on
+        #"php_admin_flag[log_errors]" = "on";
-        env[PATH] = ${lib.makeBinPath [ pkgs.apg pkgs.unzip ]}
+        "pm" = "dynamic";
-        pm = dynamic
+        "pm.max_children" = "20";
-        pm.max_children = 20
+        "pm.start_servers" = "2";
-        pm.start_servers = 2
+        "pm.min_spare_servers" = "1";
-        pm.min_spare_servers = 1
+        "pm.max_spare_servers" = "3";
-        pm.max_spare_servers = 3
+      };
-      '';
+      phpEnv = {
+        PATH = lib.makeBinPath [ pkgs.apg pkgs.unzip ];
+      };
      phpWatchFiles = [
        config.secrets.fullPaths."webapps/${app.environment}-piedsjaloux"
      ];
diff --git a/modules/private/websites/teliotortay/production.nix b/modules/private/websites/teliotortay/production.nix
index 2c62d10..62762ec 100644
--- a/modules/private/websites/teliotortay/production.nix
+++ b/modules/private/websites/teliotortay/production.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-  adminer = pkgs.callPackage ../commons/adminer.nix {};
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
  cfg = config.myServices.websites.telioTortay.production;
  varDir = "/var/lib/ftp/telio_tortay";
  env = config.myEnv.websites.telioTortay;
@@ -10,7 +10,7 @@ in {
  config = lib.mkIf cfg.enable {
    services.webstats.sites = [ { name = "telio-tortay.immae.eu"; } ];
-    security.acme2.certs."ftp".extraDomains."telio-tortay.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."telio-tortay.immae.eu" = null;
    system.activationScripts.telio-tortay = {
      deps = [ "httpd" ];
@@ -22,20 +22,19 @@ in {
    systemd.services.phpfpm-telio-tortay.after = lib.mkAfter [ "mysql.service" ];
    systemd.services.phpfpm-telio-tortay.wants = [ "mysql.service" ];
    services.phpfpm.pools.telio-tortay = {
-      listen = "/run/phpfpm/telio-tortay.sock";
+      user = "wwwrun";
-      extraConfig = ''
+      group = "wwwrun";
-        user = wwwrun
+      settings = {
-        group = wwwrun
+        "listen.owner" = "wwwrun";
-        listen.owner = wwwrun
+        "listen.group" = "wwwrun";
-        listen.group = wwwrun
-        pm = ondemand
+        "pm" = "ondemand";
-        pm.max_children = 5
+        "pm.max_children" = "5";
-        pm.process_idle_timeout = 60
+        "pm.process_idle_timeout" = "60";
-        php_admin_value[open_basedir] = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp"
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp";
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/telio-tortay"
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio-tortay";
-        '';
+      };
      phpOptions = config.services.phpfpm.phpOptions + ''
        disable_functions = "mail"
        extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -48,7 +47,7 @@ in {
      hosts        = ["telio-tortay.immae.eu" "realistesmedia.fr" "www.realistesmedia.fr" ];
      root         = varDir;
      extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
        ''
        Use Stats telio-tortay.immae.eu
        ServerAdmin ${env.server_admin}
@@ -56,7 +55,7 @@ in {
        CustomLog "${varDir}/logs/access_log" combined
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/telio-tortay.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.telio-tortay.socket}|fcgi://localhost"
        </FilesMatch>
        <Directory ${varDir}/logs>
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix
index 4785074..b9bb32f 100644
--- a/modules/private/websites/tools/cloud/default.nix
+++ b/modules/private/websites/tools/cloud/default.nix
@@ -10,37 +10,34 @@ let
    basedir = builtins.concatStringsSep ":" (
      [ nextcloud varDir ]
      ++ builtins.attrValues pkgs.webapps.nextcloud-apps);
-    socket = "/var/run/phpfpm/nextcloud.sock";
    phpConfig = ''
      extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
      extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
      zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
      '';
-    pool = ''
+    pool = {
-      user = wwwrun
+      "listen.owner" = "wwwrun";
-      group = wwwrun
+      "listen.group" = "wwwrun";
-      listen.owner = wwwrun
+      "pm" = "ondemand";
-      listen.group = wwwrun
+      "pm.max_children" = "60";
-      pm = ondemand
+      "pm.process_idle_timeout" = "60";
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      php_admin_value[output_buffering] = 0
+      "php_admin_value[output_buffering]" = "0";
-      php_admin_value[max_execution_time] = 1800
+      "php_admin_value[max_execution_time]" = "1800";
-      php_admin_value[zend_extension] = "opcache"
+      "php_admin_value[zend_extension]" = "opcache";
-      ;already enabled by default?
+      #already enabled by default?
-      ;php_value[opcache.enable] = 1
+      #"php_value[opcache.enable]" = "1";
-      php_value[opcache.enable_cli] = 1
+      "php_value[opcache.enable_cli]" = "1";
-      php_value[opcache.interned_strings_buffer] = 8
+      "php_value[opcache.interned_strings_buffer]" = "8";
-      php_value[opcache.max_accelerated_files] = 10000
+      "php_value[opcache.max_accelerated_files]" = "10000";
-      php_value[opcache.memory_consumption] = 128
+      "php_value[opcache.memory_consumption]" = "128";
-      php_value[opcache.save_comments] = 1
+      "php_value[opcache.save_comments]" = "1";
-      php_value[opcache.revalidate_freq] = 1
+      "php_value[opcache.revalidate_freq]" = "1";
-      php_admin_value[memory_limit] = 512M
+      "php_admin_value[memory_limit]" = "512M";
-      php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"
+      "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 in {
  options.myServices.websites.tools.cloud = {
@@ -71,7 +68,7 @@ in {
            </IfModule>
            <FilesMatch "\.php$">
              CGIPassAuth on
-              SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+              SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost"
            </FilesMatch>
          </Directory>
@@ -171,8 +168,9 @@ in {
      '';
    services.phpfpm.pools.nextcloud = {
-      listen = phpFpm.socket;
+      user = "wwwrun";
-      extraConfig = phpFpm.pool;
+      group = "wwwrun";
+      settings = phpFpm.pool;
      phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
    };
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 5eb3fab..9d6cd21 100644
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -73,7 +73,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_davical";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /davical "${root}"
      Alias /caldav.php  "${root}/caldav.php"
      <Directory "${root}">
@@ -84,7 +84,7 @@ rec {
        <FilesMatch "\.php$">
          CGIPassAuth on
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        RewriteEngine On
@@ -111,28 +111,25 @@ rec {
  phpFpm = rec {
    serviceDeps = [ "postgresql.service" "openldap.service" ];
    basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
-    socket = "/var/run/phpfpm/davical.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "dynamic";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.start_servers" = "2";
-      pm = dynamic
+      "pm.min_spare_servers" = "1";
-      pm.max_children = 60
+      "pm.max_spare_servers" = "10";
-      pm.start_servers = 2
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 10
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = DavicalPHPSESSID
+      "php_value[session.name]" = "DavicalPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/davical"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/davical";
-      php_admin_value[include_path] = "${awl}/inc:${webapp}/inc"
+      "php_admin_value[include_path]" = "${awl}/inc:${webapp}/inc";
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/davical"
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/davical";
-      php_flag[magic_quotes_gpc] = Off
+      "php_flag[magic_quotes_gpc]" = "Off";
-      php_flag[register_globals] = Off
+      "php_flag[register_globals]" = "Off";
-      php_admin_value[error_reporting] = "E_ALL & ~E_NOTICE"
+      "php_admin_value[error_reporting]" = "E_ALL & ~E_NOTICE";
-      php_admin_value[default_charset] = "utf-8"
+      "php_admin_value[default_charset]" = "utf-8";
-      php_flag[magic_quotes_runtime] = Off
+      "php_flag[magic_quotes_runtime]" = "Off";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index 0012965..30a562c 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -38,14 +38,15 @@ in {
      root        = "/run/current-system/webapps/_dav";
      extraConfig = [
        infcloud.vhostConf
-        davical.apache.vhostConf
+        (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket)
      ];
    };
    services.phpfpm.pools = {
      davical = {
-        listen = davical.phpFpm.socket;
+        user = config.services.httpd.Tools.user;
-        extraConfig = davical.phpFpm.pool;
+        group = config.services.httpd.Tools.group;
+        settings = davical.phpFpm.pool;
      };
    };
diff --git a/modules/private/websites/tools/db/default.nix b/modules/private/websites/tools/db/default.nix
index 60592e5..fc8d989 100644
--- a/modules/private/websites/tools/db/default.nix
+++ b/modules/private/websites/tools/db/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../../commons/adminer.nix { inherit config; };
    cfg = config.myServices.websites.tools.db;
 in {
@@ -15,7 +15,7 @@ in {
      addToCerts  = true;
      hosts       = ["db-1.immae.eu" ];
      root        = null;
-      extraConfig = [ adminer.apache.vhostConf ];
+      extraConfig = [ (adminer.apache.vhostConf null) ];
    };
  };
 }
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index 054e47b..56e4401 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -30,7 +30,7 @@ in {
      root        = gitweb.apache.root;
      extraConfig = [
        gitweb.apache.vhostConf
-        mantisbt.apache.vhostConf
+        (mantisbt.apache.vhostConf config.services.phpfpm.pools.mantisbt.socket)
        ''
          RewriteEngine on
          RewriteCond %{REQUEST_URI}       ^/releases
@@ -40,8 +40,9 @@ in {
    };
    services.phpfpm.pools = {
      mantisbt = {
-        listen = mantisbt.phpFpm.socket;
+        user = config.services.httpd.Tools.user;
-        extraConfig = mantisbt.phpFpm.pool;
+        group = config.services.httpd.Tools.group;
+        settings = mantisbt.phpFpm.pool;
      };
    };
  };
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index d75b022..50851aa 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -53,12 +53,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_mantisbt";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /mantisbt "${root}"
      <Directory "${root}">
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride All
@@ -76,20 +76,17 @@ rec {
    basedir = builtins.concatStringsSep ":" (
      [ webRoot "/var/secrets/webapps/tools-mantisbt" ]
      ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/mantisbt.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      php_admin_value[upload_max_filesize] = 5000000
+      "php_admin_value[upload_max_filesize]" = "5000000";
-      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt";
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt"
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/mantisbt";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index bb36042..1f7f7bf 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -6,6 +6,7 @@ let
  };
  rainloop = pkgs.callPackage ./rainloop.nix {};
  cfg = config.myServices.websites.tools.email;
+  pcfg = config.services.phpfpm.pools;
 in
 {
  options.myServices.websites.tools.email = {
@@ -34,8 +35,8 @@ in
      hosts      = ["mail.immae.eu"];
      root       = "/run/current-system/webapps/_mail";
      extraConfig = [
-        rainloop.apache.vhostConf
+        (rainloop.apache.vhostConf pcfg.rainloop.socket)
-        roundcubemail.apache.vhostConf
+        (roundcubemail.apache.vhostConf pcfg.roundcubemail.socket)
        ''
          <Directory /run/current-system/webapps/_mail>
            Require all granted
@@ -56,13 +57,15 @@ in
    };
    services.phpfpm.pools.roundcubemail = {
-      listen = roundcubemail.phpFpm.socket;
+      user = "wwwrun";
-      extraConfig = roundcubemail.phpFpm.pool;
+      group = "wwwrun";
+      settings = roundcubemail.phpFpm.pool;
      phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
    };
    services.phpfpm.pools.rainloop = {
-      listen = rainloop.phpFpm.socket;
+      user = "wwwrun";
-      extraConfig = rainloop.phpFpm.pool;
+      group = "wwwrun";
+      settings = rainloop.phpFpm.pool;
    };
    system.activationScripts = {
      roundcubemail = roundcubemail.activationScript;
diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix
index 2dad46e..9b1f0c5 100644
--- a/modules/private/websites/tools/mail/rainloop.nix
+++ b/modules/private/websites/tools/mail/rainloop.nix
@@ -16,7 +16,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_rainloop";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
    Alias /rainloop "${root}"
    <Directory "${root}">
      DirectoryIndex index.php
@@ -25,7 +25,7 @@ rec {
      Require all granted
      <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        SetHandler "proxy:unix:${socket}|fcgi://localhost"
      </FilesMatch>
    </Directory>
@@ -37,22 +37,19 @@ rec {
  phpFpm = rec {
    serviceDeps = [ "postgresql.service" ];
    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/rainloop.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RainloopPHPSESSID
+      "php_value[session.name]" = "RainloopPHPSESSID";
-      php_admin_value[upload_max_filesize] = 200M
+      "php_admin_value[upload_max_filesize]" = "200M";
-      php_admin_value[post_max_size] = 200M
+      "php_admin_value[post_max_size]" = "200M";
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix
index 35de312..0b35d02 100644
--- a/modules/private/websites/tools/mail/roundcubemail.nix
+++ b/modules/private/websites/tools/mail/roundcubemail.nix
@@ -83,7 +83,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_roundcubemail";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
    Alias /roundcube "${root}"
    <Directory "${root}">
        DirectoryIndex index.php
@@ -92,7 +92,7 @@ rec {
        Require all granted
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
      </Directory>
      '';
@@ -107,22 +107,19 @@ rec {
      date.timezone = 'CET'
      extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
      '';
-    socket = "/var/run/phpfpm/roundcubemail.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RoundcubemailPHPSESSID
+      "php_value[session.name]" = "RoundcubemailPHPSESSID";
-      php_admin_value[upload_max_filesize] = 200M
+      "php_admin_value[upload_max_filesize]" = "200M";
-      php_admin_value[post_max_size] = 200M
+      "php_admin_value[post_max_size]" = "200M";
-      php_admin_value[open_basedir] = "${basedir}:${apacheHttpd}/conf/mime.types:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:${apacheHttpd}/conf/mime.types:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index 907e37f..52a132c 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
-{ adminer }:
+{ adminer, php73, forcePhpSocket ? null }:
 rec {
  activationScript = {
    deps = [ "httpd" ];
@@ -9,22 +9,33 @@ rec {
  };
  webRoot = adminer;
  phpFpm = rec {
-    socket = "/var/run/phpfpm/adminer.sock";
+    user = apache.user;
-    pool = ''
+    group = apache.group;
-      user = ${apache.user}
+    phpPackage = (php73.override {
-      group = ${apache.group}
+      config.php.mysqlnd = true;
-      listen.owner = ${apache.user}
+      config.php.mysqli = false;
-      listen.group = ${apache.group}
+      config.php.pdo-mysql = false;
-      pm = ondemand
+    }).overrideAttrs(old: rec {
-      pm.max_children = 5
+      configureFlags = old.configureFlags ++ [
-      pm.process_idle_timeout = 60
+        "--with-mysqli=shared,mysqlnd"
-      ;php_admin_flag[log_errors] = on
+        ];
-      ; Needed to avoid clashes in browser cookies (same domain)
+    });
-      php_value[session.name] = AdminerPHPSESSID
+    phpOptions = ''
-      php_admin_value[open_basedir] = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer"
+      extension=${phpPackage}/lib/php/extensions/mysqli.so
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/adminer"
+    '';
-      php_admin_value[upload_tmp_dir] = "/var/lib/php/tmp/adminer"
+    settings = {
-      '';
+      "listen.owner" = apache.user;
+      "listen.group" = apache.group;
+      "pm" = "ondemand";
+      "pm.max_children" = "5";
+      "pm.process_idle_timeout" = "60";
+      #"php_admin_flag[log_errors]" = "on";
+      # Needed to avoid clashes in browser cookies (same domain)
+      "php_value[session.name]" = "AdminerPHPSESSID";
+      "php_admin_value[open_basedir]" = "${webRoot}:/tmp:/var/lib/php/sessions/adminer:/var/lib/php/tmp/adminer";
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/adminer";
+      "php_admin_value[upload_tmp_dir]" = "/var/lib/php/tmp/adminer";
+    };
  };
  apache = rec {
    user = "wwwrun";
@@ -32,12 +43,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "_adminer";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /adminer ${root}
      <Directory ${root}>
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${if forcePhpSocket != null then forcePhpSocket else socket}|fcgi://localhost"
        </FilesMatch>
        Use LDAPConnect
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 5dc0981..5e0d446 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -40,6 +40,7 @@ let
  };
  cfg = config.myServices.websites.tools.tools;
+  pcfg = config.services.phpfpm.pools;
 in {
  options.myServices.websites.tools.tools = {
    enable = lib.mkEnableOption "enable tools website";
@@ -92,7 +93,7 @@ in {
            AllowOverride all
            Require all granted
            <FilesMatch "\.php$">
-              SetHandler "proxy:unix:/var/run/phpfpm/devtools.sock|fcgi://localhost"
+              SetHandler "proxy:unix:${pcfg.devtools.socket}|fcgi://localhost"
            </FilesMatch>
          </Directory>
          ''
@@ -115,21 +116,21 @@ in {
            AllowOverride all
            Require all granted
            <FilesMatch "\.php$">
-              SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost"
+              SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost"
            </FilesMatch>
          </Directory>
          ''
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf pcfg.adminer.socket)
        ympd.apache.vhostConf
-        ttrss.apache.vhostConf
+        (ttrss.apache.vhostConf pcfg.ttrss.socket)
-        wallabag.apache.vhostConf
+        (wallabag.apache.vhostConf pcfg.wallabag.socket)
-        yourls.apache.vhostConf
+        (yourls.apache.vhostConf pcfg.yourls.socket)
-        rompr.apache.vhostConf
+        (rompr.apache.vhostConf pcfg.rompr.socket)
-        shaarli.apache.vhostConf
+        (shaarli.apache.vhostConf pcfg.shaarli.socket)
-        dokuwiki.apache.vhostConf
+        (dokuwiki.apache.vhostConf pcfg.dokuwiki.socket)
-        ldap.apache.vhostConf
+        (ldap.apache.vhostConf pcfg.ldap.socket)
-        kanboard.apache.vhostConf
+        (kanboard.apache.vhostConf pcfg.kanboard.socket)
-        grocy.apache.vhostConf
+        (grocy.apache.vhostConf pcfg.grocy.socket)
      ];
    };
@@ -226,38 +227,36 @@ in {
    services.phpfpm.pools = {
      tools = {
-        listen = "/var/run/phpfpm/tools.sock";
+        user = "wwwrun";
-        extraConfig = ''
+        group = "wwwrun";
-          user = wwwrun
+        settings = {
-          group = wwwrun
+          "listen.owner" = "wwwrun";
-          listen.owner = wwwrun
+          "listen.group" = "wwwrun";
-          listen.group = wwwrun
+          "pm" = "dynamic";
-          pm = dynamic
+          "pm.max_children" = "60";
-          pm.max_children = 60
+          "pm.start_servers" = "2";
-          pm.start_servers = 2
+          "pm.min_spare_servers" = "1";
-          pm.min_spare_servers = 1
+          "pm.max_spare_servers" = "10";
-          pm.max_spare_servers = 10
-          ; Needed to avoid clashes in browser cookies (same domain)
+          # Needed to avoid clashes in browser cookies (same domain)
-          php_value[session.name] = ToolsPHPSESSID
+          "php_value[session.name]" = "ToolsPHPSESSID";
-          php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp"
+          "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp";
-          '';
+        };
      };
      devtools = {
-        listen = "/var/run/phpfpm/devtools.sock";
+        user = "wwwrun";
-        extraConfig = ''
+        group = "wwwrun";
-          user = wwwrun
+        settings = {
-          group = wwwrun
+          "listen.owner" = "wwwrun";
-          listen.owner = wwwrun
+          "listen.group" = "wwwrun";
-          listen.group = wwwrun
+          "pm" = "dynamic";
-          pm = dynamic
+          "pm.max_children" = "60";
-          pm.max_children = 60
+          "pm.start_servers" = "2";
-          pm.start_servers = 2
+          "pm.min_spare_servers" = "1";
-          pm.min_spare_servers = 1
+          "pm.max_spare_servers" = "10";
-          pm.max_spare_servers = 10
-          php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
+          "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
-          '';
+        };
        phpOptions = config.services.phpfpm.phpOptions + ''
          extension=${pkgs.php}/lib/php/extensions/mysqli.so
          extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
@@ -265,45 +264,51 @@ in {
          zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
          '';
      };
-      adminer = {
+      adminer = adminer.phpFpm;
-        listen = adminer.phpFpm.socket;
-        extraConfig = adminer.phpFpm.pool;
-      };
      ttrss = {
-        listen = ttrss.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = ttrss.phpFpm.pool;
+        group = "wwwrun";
+        settings = ttrss.phpFpm.pool;
      };
      wallabag = {
-        listen = wallabag.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = wallabag.phpFpm.pool;
+        group = "wwwrun";
+        settings = wallabag.phpFpm.pool;
      };
      yourls = {
-        listen = yourls.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = yourls.phpFpm.pool;
+        group = "wwwrun";
+        settings = yourls.phpFpm.pool;
      };
      rompr = {
-        listen = rompr.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = rompr.phpFpm.pool;
+        group = "wwwrun";
+        settings = rompr.phpFpm.pool;
      };
      shaarli = {
-        listen = shaarli.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = shaarli.phpFpm.pool;
+        group = "wwwrun";
+        settings = shaarli.phpFpm.pool;
      };
      dokuwiki = {
-        listen = dokuwiki.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = dokuwiki.phpFpm.pool;
+        group = "wwwrun";
+        settings = dokuwiki.phpFpm.pool;
      };
      ldap = {
-        listen = ldap.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = ldap.phpFpm.pool;
+        group = "wwwrun";
+        settings = ldap.phpFpm.pool;
      };
      kanboard = {
-        listen = kanboard.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = kanboard.phpFpm.pool;
+        group = "wwwrun";
+        settings = kanboard.phpFpm.pool;
      };
      grocy = {
-        listen = grocy.phpFpm.socket;
+        user = "wwwrun";
-        extraConfig = grocy.phpFpm.pool;
+        group = "wwwrun";
+        settings = grocy.phpFpm.pool;
      };
    };
diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index d66e85d..26c04b7 100644
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -26,12 +26,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_dokuwiki";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /dokuwiki "${root}"
      <Directory "${root}">
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride All
@@ -44,20 +44,17 @@ rec {
    serviceDeps = [ "openldap.service" ];
    basedir = builtins.concatStringsSep ":" (
      [ webRoot varDir ] ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/dokuwiki.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = DokuwikiPHPSESSID
+      "php_value[session.name]" = "DokuwikiPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/grocy.nix b/modules/private/websites/tools/tools/grocy.nix
index 1b8da20..a98d8ac 100644
--- a/modules/private/websites/tools/tools/grocy.nix
+++ b/modules/private/websites/tools/tools/grocy.nix
@@ -18,12 +18,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_grocy";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /grocy "${root}"
      <Directory "${root}">
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride All
@@ -35,21 +35,18 @@ rec {
  phpFpm = rec {
    basedir = builtins.concatStringsSep ":" (
      [ grocy grocy.yarnModules varDir ]);
-    socket = "/var/run/phpfpm/grocy.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = grocyPHPSESSID
+      "php_value[session.name]" = "grocyPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix
index 1880cbd..0f6fefc 100644
--- a/modules/private/websites/tools/tools/kanboard.nix
+++ b/modules/private/websites/tools/tools/kanboard.nix
@@ -49,7 +49,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_kanboard";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
    Alias /kanboard "${root}"
    <Directory "${root}">
      DirectoryIndex index.php
@@ -58,7 +58,7 @@ rec {
      Require all granted
      <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+        SetHandler "proxy:unix:${socket}|fcgi://localhost"
      </FilesMatch>
    </Directory>
    <DirectoryMatch "${root}/data">
@@ -69,20 +69,17 @@ rec {
  phpFpm = rec {
    serviceDeps = [ "postgresql.service" "openldap.service" ];
    basedir = builtins.concatStringsSep ":" [ webRoot varDir "/var/secrets/webapps/tools-kanboard" ];
-    socket = "/var/run/phpfpm/kanboard.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = KanboardPHPSESSID
+      "php_value[session.name]" = "KanboardPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/ldap.nix b/modules/private/websites/tools/tools/ldap.nix
index e58a9bd..0c1a21f 100644
--- a/modules/private/websites/tools/tools/ldap.nix
+++ b/modules/private/websites/tools/tools/ldap.nix
@@ -39,12 +39,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_ldap";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /ldap "${root}"
      <Directory "${root}">
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride None
@@ -55,20 +55,17 @@ rec {
  phpFpm = rec {
    serviceDeps = [ "openldap.service" ];
    basedir = builtins.concatStringsSep ":" [ webRoot "/var/secrets/webapps/tools-ldap" ];
-    socket = "/var/run/phpfpm/ldap.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = LdapPHPSESSID
+      "php_value[session.name]" = "LdapPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/phpldapadmin"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/phpldapadmin";
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/phpldapadmin"
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/phpldapadmin";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix
index 75adabe..106164c 100644
--- a/modules/private/websites/tools/tools/rompr.nix
+++ b/modules/private/websites/tools/tools/rompr.nix
@@ -15,7 +15,7 @@ rec {
    modules = [ "headers" "mime" "proxy_fcgi" ];
    webappName = "tools_rompr";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /rompr ${root}
      <Directory ${root}>
@@ -29,7 +29,7 @@ rec {
        AddType image/x-icon .ico
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
      </Directory>
@@ -51,29 +51,26 @@ rec {
  };
  phpFpm = rec {
    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/rompr.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RomprPHPSESSID
+      "php_value[session.name]" = "RomprPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      php_flag[magic_quotes_gpc] = Off
+      "php_flag[magic_quotes_gpc]" = "Off";
-      php_flag[track_vars] = On
+      "php_flag[track_vars]" = "On";
-      php_flag[register_globals] = Off
+      "php_flag[register_globals]" = "Off";
-      php_admin_flag[allow_url_fopen] = On
+      "php_admin_flag[allow_url_fopen]" = "On";
-      php_value[include_path] = ${webRoot}
+      "php_value[include_path]" = "${webRoot}";
-      php_admin_value[upload_tmp_dir] = "${varDir}/prefs"
+      "php_admin_value[upload_tmp_dir]" = "${varDir}/prefs";
-      php_admin_value[post_max_size] = 32M
+      "php_admin_value[post_max_size]" = "32M";
-      php_admin_value[upload_max_filesize] = 32M
+      "php_admin_value[upload_max_filesize]" = "32M";
-      php_admin_value[memory_limit] = 256M
+      "php_admin_value[memory_limit]" = "256M";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index 0a75755..950d296 100644
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -17,7 +17,7 @@ in rec {
    modules =  [ "proxy_fcgi" "rewrite" "env" ];
    webappName = "tools_shaarli";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /Shaarli "${root}"
      Include /var/secrets/webapps/tools-shaarli
@@ -27,7 +27,7 @@ in rec {
        AllowOverride All
        Require all granted
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
      </Directory>
      '';
@@ -48,20 +48,17 @@ in rec {
  phpFpm = rec {
    serviceDeps = [ "openldap.service" ];
    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/shaarli.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-        user = ${apache.user}
+      "listen.group" = apache.group;
-        group = ${apache.group}
+      "pm" = "ondemand";
-        listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-        listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-        pm = ondemand
-        pm.max_children = 60
-        pm.process_idle_timeout = 60
-        ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-        php_value[session.name] = ShaarliPHPSESSID
+      "php_value[session.name]" = "ShaarliPHPSESSID";
-        php_admin_value[open_basedir] = "${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-        php_admin_value[session.save_path] = "${varDir}/phpSessions"
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-    '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix
index a8b2a93..48876d3 100644
--- a/modules/private/websites/tools/tools/ttrss.nix
+++ b/modules/private/websites/tools/tools/ttrss.nix
@@ -95,12 +95,12 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_ttrss";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /ttrss "${root}"
      <Directory "${root}">
        DirectoryIndex index.php
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride All
@@ -114,20 +114,17 @@ rec {
    basedir = builtins.concatStringsSep ":" (
      [ webRoot "/var/secrets/webapps/tools-ttrss" varDir ]
      ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/ttrss.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
+      # Needed to avoid clashes in browser cookies (same domain)
-      pm.process_idle_timeout = 60
+      "php_value[session.name]" = "TtrssPHPSESSID";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      ; Needed to avoid clashes in browser cookies (same domain)
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
-      php_value[session.name] = TtrssPHPSESSID
+    };
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
-      '';
  };
 }
diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix
index 014d8a1..00e2dc9 100644
--- a/modules/private/websites/tools/tools/wallabag.nix
+++ b/modules/private/websites/tools/tools/wallabag.nix
@@ -82,7 +82,7 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_wallabag";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /wallabag "${root}"
      <Directory "${root}">
        AllowOverride None
@@ -91,7 +91,7 @@ rec {
        CGIPassAuth On
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        <IfModule mod_rewrite.c>
@@ -129,22 +129,19 @@ rec {
    '';
    serviceDeps = [ "postgresql.service" "openldap.service" ];
    basedir = builtins.concatStringsSep ":" [ webappDir "/var/secrets/webapps/tools-wallabag" varDir ];
-    socket = "/var/run/phpfpm/wallabag.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "dynamic";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.start_servers" = "2";
-      pm = dynamic
+      "pm.min_spare_servers" = "1";
-      pm.max_children = 60
+      "pm.max_spare_servers" = "10";
-      pm.start_servers = 2
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 10
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = WallabagPHPSESSID
+      "php_value[session.name]" = "WallabagPHPSESSID";
-      php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:${basedir}:/tmp"
+      "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/tmp";
-      php_value[max_execution_time] = 300
+      "php_value[max_execution_time]" = "300";
-      '';
+    };
  };
 }
diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix
index 466ceae..cb03b6c 100644
--- a/modules/private/websites/tools/tools/yourls.nix
+++ b/modules/private/websites/tools/tools/yourls.nix
@@ -48,11 +48,11 @@ rec {
    modules = [ "proxy_fcgi" ];
    webappName = "tools_yourls";
    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
      Alias /url "${root}"
      <Directory "${root}">
        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
        </FilesMatch>
        AllowOverride None
@@ -73,20 +73,17 @@ rec {
    basedir = builtins.concatStringsSep ":" (
      [ webRoot "/var/secrets/webapps/tools-yourls" ]
      ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/yourls.sock";
+    pool = {
-    pool = ''
+      "listen.owner" = apache.user;
-      user = ${apache.user}
+      "listen.group" = apache.group;
-      group = ${apache.group}
+      "pm" = "ondemand";
-      listen.owner = ${apache.user}
+      "pm.max_children" = "60";
-      listen.group = ${apache.group}
+      "pm.process_idle_timeout" = "60";
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-      ; Needed to avoid clashes in browser cookies (same domain)
+      # Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = YourlsPHPSESSID
+      "php_value[session.name]" = "YourlsPHPSESSID";
-      php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/yourls"
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/yourls";
-      php_admin_value[session.save_path] = "/var/lib/php/sessions/yourls"
+      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/yourls";
-      '';
+    };
  };
 }
diff --git a/modules/webapps/mastodon.nix b/modules/webapps/mastodon.nix
index eed9e3f..68531cf 100644
--- a/modules/webapps/mastodon.nix
+++ b/modules/webapps/mastodon.nix
@@ -27,7 +27,7 @@ in
      '';
    };
    socketsPrefix = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
      default = "live";
      description = ''
        The prefix to use for Mastodon sockets.
diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index e822645..fe5f068 100644
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -23,7 +23,7 @@ in {
              '';
          };
          name = lib.mkOption {
-            type = lib.types.string;
+            type = lib.types.str;
            description  = ''
              Domain name. Corresponds to the Apache file name and the
              folder name in which the state will be saved.
diff --git a/modules/websites/default.nix b/modules/websites/default.nix
index 767a7b2..3f46e65 100644
--- a/modules/websites/default.nix
+++ b/modules/websites/default.nix
@@ -38,7 +38,7 @@ in
            description = "Name of the httpd instance to assign this type to";
          };
          ips = mkOption {
-            type = listOf string;
+            type = listOf str;
            default = [];
            description = "ips to listen to";
          };
@@ -59,7 +59,7 @@ in
              options = {
                enable = mkEnableOption "Add default no-ssl vhost for this instance";
                host = mkOption {
-                  type = string;
+                  type = str;
                  description = "The hostname to use for this vhost";
                };
                root = mkOption {
@@ -68,7 +68,7 @@ in
                  description = "The root folder to serve";
                };
                indexFile = mkOption {
-                  type = string;
+                  type = str;
                  default = "index.html";
                  description = "The index file to show.";
                };
@@ -79,8 +79,8 @@ in
            description = "The fallback vhost that will be defined as first vhost in Apache";
            type = submodule {
              options = {
-                certName = mkOption { type = string; };
+                certName = mkOption { type = str; };
-                hosts    = mkOption { type = listOf string; };
+                hosts    = mkOption { type = listOf str; };
                root     = mkOption { type = nullOr path; };
                extraConfig = mkOption { type = listOf lines; default = []; };
              };
@@ -91,7 +91,7 @@ in
            description = "List of no ssl vhosts to define for Apache";
            type = attrsOf (submodule {
              options = {
-                hosts    = mkOption { type = listOf string; };
+                hosts    = mkOption { type = listOf str; };
                root     = mkOption { type = nullOr path; };
                extraConfig = mkOption { type = listOf lines; default = []; };
              };
@@ -102,25 +102,25 @@ in
            description = "List of vhosts to define for Apache";
            type = attrsOf (submodule {
              options = {
-                certName = mkOption { type = string; };
+                certName = mkOption { type = str; };
                addToCerts = mkOption {
                  type = bool;
                  default = false;
                  description = "Use these to certificates. Is ignored (considered true) if certMainHost is not null";
                };
                certMainHost = mkOption {
-                  type = nullOr string;
+                  type = nullOr str;
                  description = "Use that host as 'main host' for acme certs";
                  default = null;
                };
-                hosts    = mkOption { type = listOf string; };
+                hosts    = mkOption { type = listOf str; };
                root     = mkOption { type = nullOr path; };
                extraConfig = mkOption { type = listOf lines; default = []; };
              };
            });
          };
          watchPaths = mkOption {
-            type = listOf string;
+            type = listOf str;
            default = [];
            description = ''
              Paths to watch that should trigger a reload of httpd
@@ -178,9 +178,9 @@ in
    };
    toVhost = ips: vhostConf: {
      enableSSL = true;
-      sslServerCert = "${config.security.acme2.certs."${vhostConf.certName}".directory}/cert.pem";
+      sslServerCert = "${config.security.acme.certs."${vhostConf.certName}".directory}/cert.pem";
-      sslServerKey = "${config.security.acme2.certs."${vhostConf.certName}".directory}/key.pem";
+      sslServerKey = "${config.security.acme.certs."${vhostConf.certName}".directory}/key.pem";
-      sslServerChain = "${config.security.acme2.certs."${vhostConf.certName}".directory}/chain.pem";
+      sslServerChain = "${config.security.acme.certs."${vhostConf.certName}".directory}/chain.pem";
      logFormat = "combinedVhost";
      listen = map (ip: { inherit ip; port = 443; }) ips;
      hostName = builtins.head vhostConf.hosts;
@@ -231,7 +231,7 @@ in
    }
  ) cfg.env;
-  config.security.acme2.certs = let
+  config.security.acme.certs = let
    typesToManage = attrsets.filterAttrs (k: v: v.enable) cfg.env;
    flatVhosts = lists.flatten (attrsets.mapAttrsToList (k: v:
      attrValues v.vhostConfs
diff --git a/modules/websites/httpd-service-builder.nix b/modules/websites/httpd-service-builder.nix
index d049202..f0208ab 100644
--- a/modules/websites/httpd-service-builder.nix
+++ b/modules/websites/httpd-service-builder.nix
@@ -11,8 +11,6 @@ let
  httpd = mainCfg.package.out;
-  version24 = !versionOlder httpd.version "2.4";
  httpdConf = mainCfg.configFile;
  php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
@@ -26,10 +24,9 @@ let
    else [{ip = "*"; port = 80;}];
  getListen = cfg:
-    let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen;
+    if cfg.listen == []
-    in if list == []
+      then defaultListen cfg
-        then defaultListen cfg
+      else cfg.listen;
-        else list;
  listenToString = l: "${l.ip}:${toString l.port}";
@@ -110,11 +107,10 @@ let
      "auth_basic" "auth_digest"
      # Authentication: is the user who he claims to be?
-      "authn_file" "authn_dbm" "authn_anon"
+      "authn_file" "authn_dbm" "authn_anon" "authn_core"
-      (if version24 then "authn_core" else "authn_alias")
      # Authorization: is the user allowed access?
-      "authz_user" "authz_groupfile" "authz_host"
+      "authz_user" "authz_groupfile" "authz_host" "authz_core"
      # Other modules.
      "ext_filter" "include" "log_config" "env" "mime_magic"
@@ -122,14 +118,9 @@ let
      "mime" "dav" "status" "autoindex" "asis" "info" "dav_fs"
      "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
      "userdir" "alias" "rewrite" "proxy" "proxy_http"
-    ]
+      "unixd" "cache" "cache_disk" "slotmem_shm" "socache_shmcb"
-    ++ optionals version24 [
      "mpm_${mainCfg.multiProcessingModule}"
-      "authz_core"
-      "unixd"
-      "cache" "cache_disk"
-      "slotmem_shm"
-      "socache_shmcb"
      # For compatibility with old configurations, the new module mod_access_compat is provided.
      "access_compat"
    ]
@@ -138,19 +129,8 @@ let
    ++ extraApacheModules;
-  allDenied = if version24 then ''
+  allDenied = "Require all denied";
-    Require all denied
+  allGranted = "Require all granted";
-  '' else ''
-    Order deny,allow
-    Deny from all
-  '';
-  allGranted = if version24 then ''
-    Require all granted
-  '' else ''
-    Order allow,deny
-    Allow from all
-  '';
  loggingConf = (if mainCfg.logFormat != "none" then ''
@@ -183,9 +163,9 @@ let
  sslConf = ''
-    SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000)
+    SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000)
-    ${if version24 then "Mutex" else "SSLMutex"} posixsem
+    Mutex posixsem
    SSLRandomSeed startup builtin
    SSLRandomSeed connect builtin
@@ -325,9 +305,7 @@ let
    ServerRoot ${httpd}
-    ${optionalString version24 ''
+    DefaultRuntimeDir ${mainCfg.stateDir}/runtime
-      DefaultRuntimeDir ${mainCfg.stateDir}/runtime
-    ''}
    PidFile ${mainCfg.stateDir}/httpd.pid
@@ -361,7 +339,7 @@ let
          ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
          ++ concatMap (svc: svc.extraModules) allSubservices
          ++ extraForeignModules;
-      in concatMapStrings load allModules
+      in concatMapStrings load (unique allModules)
    }
    AddHandler type-map var
@@ -393,14 +371,6 @@ let
    # Generate directives for the main server.
    ${perServerConf true mainCfg}
-    # Always enable virtual hosts; it doesn't seem to hurt.
-    ${let
-        listen = concatMap getListen allHosts;
-        uniqueListen = uniqList {inputList = listen;};
-        directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen;
-      in optionalString (!version24) directives
-    }
    ${let
        makeVirtualHost = vhost: ''
          <VirtualHost ${concatStringsSep " " (map listenToString (getListen vhost))}>
@@ -663,7 +633,7 @@ in
                     message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
                 ];
-    warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
+    warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts);
    users.users = optionalAttrs (withUsers && mainCfg.user == "wwwrun") (singleton
      { name = "wwwrun";
@@ -686,7 +656,7 @@ in
        ; Don't advertise PHP
        expose_php = off
-      '' + optionalString (!isNull config.time.timeZone) ''
+      '' + optionalString (config.time.timeZone != null) ''
        ; Apparently PHP doesn't use $TZ.
        date.timezone = "${config.time.timeZone}"
@@ -713,10 +683,10 @@ in
          ''
            mkdir -m 0750 -p ${mainCfg.stateDir}
            [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir}
-            ${optionalString version24 ''
-              mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
+            mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
-              [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
+            [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
-            ''}
            mkdir -m 0700 -p ${mainCfg.logDir}
            # Get rid of old semaphores.  These tend to accumulate across
diff --git a/modules/websites/php-application.nix b/modules/websites/php-application.nix
index 8ad7a0d..20e2a5d 100644
--- a/modules/websites/php-application.nix
+++ b/modules/websites/php-application.nix
@@ -44,10 +44,15 @@ in
            description = "Name of the socket to listen to. Defaults to app name if null";
          };
          phpPool = mkOption {
-            type = lines;
+            type = attrsOf str;
-            default = "";
+            default = {};
            description = "Pool configuration to append";
          };
+          phpEnv = mkOption {
+            type = attrsOf str;
+            default = {};
+            description = "Pool environment to append";
+          };
          phpOptions = mkOption {
            type = lines;
            default = "";
@@ -135,7 +140,7 @@ in
    services.phpApplication.phpListenPaths = mkOption {
      type = attrsOf path;
      default = attrsets.mapAttrs' (name: icfg: attrsets.nameValuePair
-        name "/run/phpfpm/${if icfg.phpListen == null then name else icfg.phpListen}.sock"
+        name config.services.phpfpm.pools."${name}".socket
      ) cfg.apps;
      readOnly = true;
      description = ''
@@ -162,17 +167,17 @@ in
    services.phpfpm.pools = attrsets.mapAttrs' (name: icfg: attrsets.nameValuePair
      name {
-        listen = cfg.phpListenPaths."${name}";
+        user = icfg.httpdUser;
-        extraConfig = ''
+        group = icfg.httpdUser;
-          user = ${icfg.httpdUser}
+        settings = {
-          group = ${icfg.httpdGroup}
+          "listen.owner" = icfg.httpdUser;
-          listen.owner = ${icfg.httpdUser}
+          "listen.group" = icfg.httpdGroup;
-          listen.group = ${icfg.httpdGroup}
+          "php_admin_value[open_basedir]" = builtins.concatStringsSep ":" ([icfg.app icfg.varDir] ++ icfg.phpWatchFiles ++ icfg.phpOpenbasedir);
-          ${optionalString (icfg.phpSession) ''
+        }
-            php_admin_value[session.save_path] = "${icfg.varDir}/phpSessions"''}
+        // optionalAttrs (icfg.phpSession) { "php_admin_value[session.save_path]" = "${icfg.varDir}/phpSessions"; }
-          php_admin_value[open_basedir] = "${builtins.concatStringsSep ":" ([icfg.app icfg.varDir] ++ icfg.phpWatchFiles ++ icfg.phpOpenbasedir)}"
+        // icfg.phpPool;
-          '' + icfg.phpPool;
        phpOptions = config.services.phpfpm.phpOptions + icfg.phpOptions;
+        inherit (icfg) phpEnv;
      }
    ) cfg.apps;
diff --git a/nix/sources.json b/nix/sources.json
index 6af75bd..7c306c9 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -30,30 +30,39 @@
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "nixpkgs-nixops": {
-        "channel_link": "https://nixos.org/channels/nixos-19.03",
+        "branch": "nixos-19.09",
-        "revision": "173677.daf861a810d",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "856dbd1a5c7fd826cf3668ff12a7389be0686f41",
+        "sha256": "1d895i1lc25d2akniaqg2n1jrg2rcd1gih8rpmhyrlv4lpggfmsx",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173677.daf861a810d/nixexprs.tar.xz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/856dbd1a5c7fd826cf3668ff12a7389be0686f41.tar.gz",
-        "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-        "version": "19.03"
    },
    "nixpkgs-nixops-next": {
-        "channel_link": "https://nixos.org/channels/nixos-19.03",
+        "branch": "nixos-19.03",
-        "revision": "173677.daf861a810d",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59",
+        "sha256": "11z6ajj108fy2q5g8y4higlcaqncrbjm3dnv17pvif6avagw4mcb",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173677.daf861a810d/nixexprs.tar.xz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz",
-        "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-        "version": "19.03"
    },
    "nixpkgs-nixops-previous": {
-        "channel_link": "https://nixos.org/channels/nixos-19.03",
+        "branch": "nixos-19.03",
-        "revision": "173677.daf861a810d",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59",
+        "sha256": "11z6ajj108fy2q5g8y4higlcaqncrbjm3dnv17pvif6avagw4mcb",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173677.daf861a810d/nixexprs.tar.xz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz",
-        "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-        "version": "19.03"
    }
 }
diff --git a/nixops/Makefile b/nixops/Makefile
index d8268cc..8caf8b1 100644
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -55,10 +55,10 @@ dry-run:
        $(NIXOPS_PRIV) deploy --dry-run
 build:
-        $(NIXOPS_PRIV) deploy --build-only
+        $(NIXOPS_PRIV) deploy --build-only --max-jobs 1
 upload:
-        $(NIXOPS_PRIV) deploy --copy-only
+        $(NIXOPS_PRIV) deploy --copy-only --max-concurrent-copy 1
 deploy:
        $(NIXOPS_PRIV) deploy
diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 5e40284..797332b 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -3,6 +3,12 @@ self: super: rec {
  mariadbPAM = super.mariadb.overrideAttrs(old: {
    cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
    buildInputs = old.buildInputs ++ [ self.pam ];
+    postInstall = old.postInstall + ''
+      # FIXME: hack because mariadb cannot find dialog.so
+      # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768
+      ln -s /nix $out/nix
+      cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin
+      '';
  }) // (with super.mariadb; {
    inherit client;
    servier = super.mariadb;
diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix
index 8d1405e..ae58987 100644
--- a/overlays/databases/postgresql/default.nix
+++ b/overlays/databases/postgresql/default.nix
@@ -4,8 +4,5 @@ self: super: rec {
    passthru = old.passthru // { psqlSchema = "11.0"; };
    configureFlags = old.configureFlags ++ [ "--with-pam" ];
    buildInputs = (old.buildInputs or []) ++ [ self.pam ];
-    patches = old.patches ++ [
-      ./postgresql_run_socket_path.patch
-    ];
  });
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index 9fd0117..b488fd7 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -31,5 +31,6 @@
  ympd = import ./ympd;
  doing = import ./doing;
  xmr-stak = import ./xmr-stak;
+  simp_le = import ./simp_le;
 }
 // import ./python-packages
diff --git a/overlays/gitweb/default.nix b/overlays/gitweb/default.nix
index aa17d22..2b9c0f6 100644
--- a/overlays/gitweb/default.nix
+++ b/overlays/gitweb/default.nix
@@ -1,6 +1,6 @@
 self: super: {
  gitweb = super.gitweb.overrideAttrs(old: {
-    installPhase = old.installPhase + ''
+    postInstall = old.postInstall or "" + ''
      cp -r ${./theme} $out/gitweb-theme;
      '';
  });
diff --git a/overlays/shaarli/default.nix b/overlays/shaarli/default.nix
index c2fb9cc..3b37ee8 100644
--- a/overlays/shaarli/default.nix
+++ b/overlays/shaarli/default.nix
@@ -1,5 +1,10 @@
 self: super: {
-  shaarli = varDir: super.shaarli.overrideAttrs (old: {
+  shaarli = varDir: super.shaarli.overrideAttrs (old: rec {
+    version = "0.10.2";
+    src = self.fetchurl {
+      url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
+      sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78";
+    };
    patchPhase = "";
    patches = (old.patches or []) ++ [ ./shaarli_ldap.patch ];
    installPhase = (old.installPhase or "") + ''
diff --git a/overlays/simp_le/default.nix b/overlays/simp_le/default.nix
new file mode 100644
index 0000000..76891ed
--- /dev/null
+++ b/overlays/simp_le/default.nix
@@ -0,0 +1,3 @@
+self: super: {
+  simp_le = self.simp_le_0_17;
+}
diff --git a/pkgs/bitlbee-mastodon/default.nix b/pkgs/bitlbee-mastodon/default.nix
index 0451068..385db75 100644
--- a/pkgs/bitlbee-mastodon/default.nix
+++ b/pkgs/bitlbee-mastodon/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bitlbee, glib, lib }:
 stdenv.mkDerivation rec {
  name = "bitlbee-mastodon-${version}";
-  version = "v1.4.2";
+  version = "v1.4.4";
  src = fetchFromGitHub {
    rev = version;
    owner = "kensanata";
    repo = "bitlbee-mastodon";
-    sha256 = "04rakgr1pfsg1vhfwlfbggbzw249j7dmk88xrsnf3n84c5ccdyas";
+    sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk";
  };
  nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
  preConfigure = ''
    export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    export BITLBEE_DATADIR=$out/share/bitlbee
+    chmod +x autogen.sh
    ./autogen.sh
  '';
diff --git a/pkgs/mpd_0_21/default.nix b/pkgs/mpd_0_21/default.nix
index f19a76f..4f97e3f 100644
--- a/pkgs/mpd_0_21/default.nix
+++ b/pkgs/mpd_0_21/default.nix
@@ -21,13 +21,7 @@
 }:
 let
-  major = "0.21";
-  minor = "7";
  lib = stdenv.lib;
-  mkDisable = f: "-D${f}=disabled";
-  mkEnable = f: "-D${f}=enabled";
-  keys = lib.mapAttrsToList (k: v: k);
  featureDependencies = {
    # Storage plugins
@@ -77,6 +71,7 @@ let
    icu           = [ icu ];
    pcre          = [ pcre ];
    sqlite        = [ sqlite ];
+    syslog        = [ ];
    systemd       = [ systemd ];
    yajl          = [ yajl ];
    zeroconf      = [ avahi dbus ];
@@ -84,49 +79,60 @@ let
  run = { features ? null }:
    let
-      fl = if (features == null )
-        then keys featureDependencies
-        else features;
      # Disable platform specific features if needed
      # using libmad to decode mp3 files on darwin is causing a segfault -- there
      # is probably a solution, but I'm disabling it for now
-      platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ]
+      platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ]
-                  ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" ];
+                  ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ];
-      features_ = lib.subtractLists platformMask fl;
+      knownFeatures = builtins.attrNames featureDependencies;
+      platformFeatures = lib.subtractLists platformMask knownFeatures;
+      features_ = if (features == null )
+        then platformFeatures
+        else
+          let unknown = lib.subtractLists knownFeatures features; in
+          if (unknown != [])
+            then throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}"
+            else
+              let unsupported = lib.subtractLists platformFeatures features; in
+              if (unsupported != [])
+                then throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}"
+                else features;
    in stdenv.mkDerivation rec {
-      name = "mpd-${version}";
+      pname = "mpd";
-      version = "${major}${if minor == "" then "" else "." + minor}";
+      version = "0.21.21";
      src = fetchFromGitHub {
        owner  = "MusicPlayerDaemon";
        repo   = "MPD";
        rev    = "v${version}";
-        sha256 = "11zi8hmlj63ngzl06vzx05669k20j4cdsp0caz4p4ayn46fd4m17";
+        sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng";
      };
      buildInputs = [ glib boost ]
        ++ (lib.concatLists (lib.attrVals features_ featureDependencies))
-        ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox;
+        ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ];
      nativeBuildInputs = [ meson ninja pkgconfig ];
      enableParallelBuilding = true;
+      mesonAutoFeatures = "disabled";
      mesonFlags =
-        map mkEnable features_ ++ map mkDisable (lib.subtractLists features_ (keys featureDependencies))
+        map (x: "-D${x}=enabled") features_
-        ++ [ "-Dsyslog=enabled" ]
+        ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
-        ++ lib.optional (lib.any (x: x == "zeroconf") features_)
+        ++ lib.optional (builtins.elem "zeroconf" features_)
          "-Dzeroconf=avahi"
-        ++ lib.optional stdenv.isLinux
+        ++ lib.optional (builtins.elem "systemd" features_)
          "-Dsystemd_system_unit_dir=etc/systemd/system";
      meta = with stdenv.lib; {
        description = "A flexible, powerful daemon for playing music";
-        homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+        homepage    = "https://www.musicpd.org/";
        license     = licenses.gpl2;
-        maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ];
+        maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
        platforms   = platforms.unix;
        longDescription = ''
@@ -140,13 +146,17 @@ in
 {
  mpd = run { };
  mpd-small = run { features = [
-    "webdav" "curl" "mms" "nfs" "bzip2" "zzip"
+    "webdav" "curl" "mms" "bzip2" "zzip"
    "audiofile" "faad" "flac" "gme" "mad"
-    "mpg123" "opus" "vorbis"
+    "mpg123" "opus" "vorbis" "vorbisenc"
-    "vorbisenc" "lame" "libsamplerate"
+    "lame" "libsamplerate" "shout"
-    "alsa" "shout" "libmpdclient"
+    "libmpdclient" "id3tag" "expat" "pcre"
-    "id3tag" "expat" "pcre" "yajl" "sqlite"
+    "yajl" "sqlite"
    "soundcloud" "qobuz" "tidal"
-    "systemd"
+  ] ++ lib.optionals stdenv.isLinux [
+    "alsa" "systemd" "syslog"
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    "mad" "jack" "nfs"
  ]; };
+  mpdWithFeatures = run;
 }
diff --git a/pkgs/mpd_0_21/default_old.nix b/pkgs/mpd_0_21/default_old.nix
new file mode 100644
index 0000000..129894d
--- /dev/null
+++ b/pkgs/mpd_0_21/default_old.nix
@@ -0,0 +1,156 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, systemd, boost168, darwin
+, cmake, libupnp, sndio, chromaprint, soxr, libcdio, libcdio-paranoia, ao, libao
+, openal
+# Inputs
+, curl, libmms, libnfs, samba
+# Archive support
+, bzip2, zziplib
+# Codecs
+, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu
+, libmad, libmikmod, mpg123, libopus, libvorbis, lame
+# Filters
+, libsamplerate
+# Outputs
+, alsaLib, libjack2, libpulseaudio, libshout
+# Misc
+, icu, sqlite, avahi, dbus, pcre, libgcrypt, expat
+# Services
+, yajl
+# Client support
+, mpd_clientlib
+# Tag support
+, libid3tag
+}:
+let
+  major = "0.21";
+  minor = "7";
+  lib = stdenv.lib;
+  mkDisable = f: "-D${f}=disabled";
+  mkEnable = f: "-D${f}=enabled";
+  keys = lib.mapAttrsToList (k: v: k);
+  featureDependencies = {
+    # Storage plugins
+    udisks        = [ dbus ];
+    webdav        = [ curl expat ];
+    # Input plugins
+    curl          = [ curl ];
+    mms           = [ libmms ];
+    nfs           = [ libnfs ];
+    smbclient     = [ samba ];
+    # Archive support
+    bzip2         = [ bzip2 ];
+    zzip          = [ zziplib ];
+    # Decoder plugins
+    audiofile     = [ audiofile ];
+    faad          = [ faad2 ];
+    ffmpeg        = [ ffmpeg ];
+    flac          = [ flac ];
+    fluidsynth    = [ fluidsynth ];
+    gme           = [ game-music-emu ];
+    mad           = [ libmad ];
+    mikmod        = [ libmikmod ];
+    mpg123        = [ mpg123 ];
+    opus          = [ libopus ];
+    vorbis        = [ libvorbis ];
+    # Encoder plugins
+    vorbisenc     = [ libvorbis ];
+    lame          = [ lame ];
+    # Filter plugins
+    libsamplerate = [ libsamplerate ];
+    # Output plugins
+    alsa          = [ alsaLib ];
+    jack          = [ libjack2 ];
+    pulse         = [ libpulseaudio ];
+    shout         = [ libshout ];
+    # Commercial services
+    qobuz         = [ curl libgcrypt yajl ];
+    soundcloud    = [ curl yajl ];
+    tidal         = [ curl yajl ];
+    # Client support
+    libmpdclient  = [ mpd_clientlib ];
+    # Tag support
+    id3tag        = [ libid3tag ];
+    # Misc
+    dbus          = [ dbus ];
+    expat         = [ expat ];
+    icu           = [ icu ];
+    pcre          = [ pcre ];
+    sqlite        = [ sqlite ];
+    systemd       = [ systemd ];
+    yajl          = [ yajl ];
+    zeroconf      = [ avahi dbus ];
+  };
+  run = { features ? null }:
+    let
+      fl = if (features == null )
+        then keys featureDependencies
+        else features;
+      # Disable platform specific features if needed
+      # using libmad to decode mp3 files on darwin is causing a segfault -- there
+      # is probably a solution, but I'm disabling it for now
+      platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ]
+                  ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" ];
+      features_ = lib.subtractLists platformMask fl;
+    in stdenv.mkDerivation rec {
+      name = "mpd-${version}";
+      version = "${major}${if minor == "" then "" else "." + minor}";
+      src = fetchFromGitHub {
+        owner  = "MusicPlayerDaemon";
+        repo   = "MPD";
+        rev    = "v${version}";
+        sha256 = "11zi8hmlj63ngzl06vzx05669k20j4cdsp0caz4p4ayn46fd4m17";
+      };
+      buildInputs = [ cmake glib boost168 sndio libupnp chromaprint soxr
+          libcdio libcdio-paranoia ao libao openal libvorbis
+        ]
+        ++ (lib.concatLists (lib.attrVals features_ featureDependencies))
+        ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox;
+      nativeBuildInputs = [ meson ninja pkgconfig ];
+      enableParallelBuilding = true;
+      mesonFlags =
+        map mkEnable features_ ++ map mkDisable (lib.subtractLists features_ (keys featureDependencies))
+        ++ [ "-Dsyslog=enabled" ]
+        ++ lib.optional (lib.any (x: x == "zeroconf") features_)
+          "-Dzeroconf=avahi"
+        ++ lib.optional stdenv.isLinux
+          "-Dsystemd_system_unit_dir=etc/systemd/system";
+      meta = with stdenv.lib; {
+        description = "A flexible, powerful daemon for playing music";
+        homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+        license     = licenses.gpl2;
+        maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ];
+        platforms   = platforms.unix;
+        longDescription = ''
+          Music Player Daemon (MPD) is a flexible, powerful daemon for playing
+          music. Through plugins and libraries it can play a variety of sound
+          files while being controlled by its network protocol.
+        '';
+      };
+    };
+in
+{
+  mpd = run { };
+  mpd-small = run { features = [
+    "webdav" "curl" "mms" "nfs" "bzip2" "zzip"
+    "audiofile" "faad" "flac" "gme" "mad"
+    "mpg123" "opus" "vorbis"
+    "vorbisenc" "lame" "libsamplerate"
+    "alsa" "shout" "libmpdclient"
+    "id3tag" "expat" "pcre" "yajl" "sqlite"
+    "soundcloud" "qobuz" "tidal"
+    "systemd"
+  ]; };
+}
diff --git a/pkgs/private/webapps/aten/default.nix b/pkgs/private/webapps/aten/default.nix
index c36e15d..5a726e9 100644
--- a/pkgs/private/webapps/aten/default.nix
+++ b/pkgs/private/webapps/aten/default.nix
@@ -22,7 +22,7 @@ let
        postInstall = let
          nodeHeaders = fetchurl {
            url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-            sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
+            sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj";
          };
        in
          ''
diff --git a/pkgs/private/webapps/chloe/chloe.json b/pkgs/private/webapps/chloe/chloe.json
index 6d58e8c..8508c14 100644
--- a/pkgs/private/webapps/chloe/chloe.json
+++ b/pkgs/private/webapps/chloe/chloe.json
@@ -1,5 +1,5 @@
 {
-  "tag": "96fc4eb-master",
+  "tag": "b971edc-master",
  "meta": {
    "name": "chloe",
    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
@@ -7,8 +7,8 @@
  },
  "git": {
    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
-    "rev": "96fc4eb0099a29b0f9a58fb4eaec4bf14ac65f0a",
+    "rev": "b971edce80e922e895836ddf7caeb4023a2db973",
-    "sha256": "0mf15j6z86j2smm2k360cmm5djhcjbs9949pznwi57kw97vkm1s3",
+    "sha256": "1igjr0rgp69szrhcl8kz02ng54w8lw6r0c6jibigp8v5a4spp222",
    "fetchSubmodules": true
  }
 }
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json b/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
index 27ca94c..e61d7ab 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
@@ -1,5 +1,5 @@
 {
-  "tag": "9e87787-master",
+  "tag": "fb8641f-master",
  "meta": {
    "name": "buildslist",
    "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
@@ -7,8 +7,8 @@
  },
  "git": {
    "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
-    "rev": "9e87787b40f4d6435218268e516be56eacd8d17b",
+    "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0",
-    "sha256": "0bli9w0xwpij23jblggz2zwhb7y3gkjdvsppcy6ia3m0x0siclpi",
+    "sha256": "0hgz5yaq0mz9lvfywbkbjap7z55839k18vfyg1yhx6l1mvvbq8zc",
    "fetchSubmodules": true
  }
 }
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index a1a87b2..e5087e4 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,9 +1,13 @@
-{ mylibs, runCommand, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs }:
+{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, python2, fetchurl, jq, yarn, nodejs }:
 let
  buildslist_src = mylibs.fetchedGit ./buildslist.json;
  packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
-    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"' > $out
+    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
    '';
+  nodeHeaders = fetchurl {
+    url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
+    sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj";
+  };
  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
    name = "buildslist-yarn-modules";
    pname = name;
@@ -15,12 +19,7 @@ let
      all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
      node-sass = {
        buildInputs = [ libsass python ];
-        postInstall = let
+        postInstall =
-          nodeHeaders = fetchurl {
-            url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-            sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
-          };
-        in
          ''
            node scripts/build.js --tarball=${nodeHeaders}
          '';
@@ -32,6 +31,13 @@ let
    generated = ./bower.nix;
    src = "${buildslist_src.src}/guanlecoja/";
  };
+  # the buildbot-pkg calls yarn and screws up everything...
+  fakeYarn = writeScriptBin "yarn" ''
+    #!${stdenv.shell}
+    if [ "$1" = "--version" ]; then
+      echo "1.17"
+    fi
+    '';
 in
 pythonPackages.buildPythonPackage rec {
  pname = "buildbot-buildslist";
@@ -41,13 +47,14 @@ pythonPackages.buildPythonPackage rec {
    export HOME=$PWD
    ln -s ${buildslist_yarn}/node_modules .
    cp -a ${buildslist_bower}/bower_components ./libs
+    PATH=${buildslist_yarn}/node_modules/.bin:$PATH
    chmod -R u+w libs
    '';
  propagatedBuildInputs = with pythonPackages; [
    (klein.overridePythonAttrs(old: { checkPhase = ""; }))
    buildbot-pkg
  ];
-  nativeBuildInputs = [ yarn nodejs ];
+  nativeBuildInputs = [ fakeYarn nodejs ];
  buildInputs = [ buildslist_yarn buildslist_bower ];
  doCheck = false;
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/yarn-packages.nix b/pkgs/python-packages/buildbot/plugins/buildslist/yarn-packages.nix
index 7ab3c63..2ade970 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/yarn-packages.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/yarn-packages.nix
@@ -3,6 +3,60 @@
  packages = [
    {
+      name = "_types_babel_types___babel_types_7.0.7.tgz";
+      path = fetchurl {
+        name = "_types_babel_types___babel_types_7.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.7.tgz";
+        sha1 = "667eb1640e8039436028055737d2b9986ee336e3";
+      };
+    }
+    {
+      name = "_types_babylon___babylon_6.16.5.tgz";
+      path = fetchurl {
+        name = "_types_babylon___babylon_6.16.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.5.tgz";
+        sha1 = "1c5641db69eb8cdf378edd25b4be7754beeb48b4";
+      };
+    }
+    {
+      name = "_types_color_name___color_name_1.1.1.tgz";
+      path = fetchurl {
+        name = "_types_color_name___color_name_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0";
+      };
+    }
+    {
+      name = "Base64___Base64_0.2.1.tgz";
+      path = fetchurl {
+        name = "Base64___Base64_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
+      };
+    }
+    {
+      name = "JSONStream___JSONStream_0.6.4.tgz";
+      path = fetchurl {
+        name = "JSONStream___JSONStream_0.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.6.4.tgz";
+        sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
+      };
+    }
+    {
+      name = "JSONStream___JSONStream_0.7.4.tgz";
+      path = fetchurl {
+        name = "JSONStream___JSONStream_0.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.7.4.tgz";
+        sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
+      };
+    }
+    {
      name = "abbrev___abbrev_1.1.1.tgz";
      path = fetchurl {
        name = "abbrev___abbrev_1.1.1.tgz";
@@ -30,6 +84,51 @@
    }
    {
+      name = "acorn_globals___acorn_globals_3.1.0.tgz";
+      path = fetchurl {
+        name = "acorn_globals___acorn_globals_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz";
+        sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
+      };
+    }
+    {
+      name = "acorn___acorn_2.7.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_2.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz";
+        sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
+      };
+    }
+    {
+      name = "acorn___acorn_3.3.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    }
+    {
+      name = "acorn___acorn_4.0.13.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_4.0.13.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz";
+        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+      };
+    }
+    {
+      name = "acorn___acorn_2.6.4.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_2.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-2.6.4.tgz";
+        sha1 = "eb1f45b4a43fa31d03701a5ec46f3b52673e90ee";
+      };
+    }
+    {
      name = "after___after_0.8.2.tgz";
      path = fetchurl {
        name = "after___after_0.8.2.tgz";
@@ -39,11 +138,29 @@
    }
    {
-      name = "ajv___ajv_6.10.0.tgz";
+      name = "ajv___ajv_6.12.0.tgz";
      path = fetchurl {
-        name = "ajv___ajv_6.10.0.tgz";
+        name = "ajv___ajv_6.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz";
-        sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1";
+        sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7";
+      };
+    }
+    {
+      name = "align_text___align_text_0.1.4.tgz";
+      path = fetchurl {
+        name = "align_text___align_text_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    }
+    {
+      name = "alter___alter_0.2.0.tgz";
+      path = fetchurl {
+        name = "alter___alter_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz";
+        sha1 = "c7588808617572034aae62480af26b1d4d1cb3cd";
      };
    }
@@ -75,6 +192,15 @@
    }
    {
+      name = "ansi_regex___ansi_regex_1.1.1.tgz";
+      path = fetchurl {
+        name = "ansi_regex___ansi_regex_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz";
+        sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+      };
+    }
+    {
      name = "ansi_regex___ansi_regex_2.1.1.tgz";
      path = fetchurl {
        name = "ansi_regex___ansi_regex_2.1.1.tgz";
@@ -111,6 +237,24 @@
    }
    {
+      name = "ansi_styles___ansi_styles_4.2.1.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz";
+        sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359";
+      };
+    }
+    {
+      name = "ansi_styles___ansi_styles_1.0.0.tgz";
+      path = fetchurl {
+        name = "ansi_styles___ansi_styles_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz";
+        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+      };
+    }
+    {
      name = "ansi_wrap___ansi_wrap_0.1.0.tgz";
      path = fetchurl {
        name = "ansi_wrap___ansi_wrap_0.1.0.tgz";
@@ -120,6 +264,15 @@
    }
    {
+      name = "ansicolors___ansicolors_0.2.1.tgz";
+      path = fetchurl {
+        name = "ansicolors___ansicolors_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz";
+        sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
+      };
+    }
+    {
      name = "anymatch___anymatch_1.3.2.tgz";
      path = fetchurl {
        name = "anymatch___anymatch_1.3.2.tgz";
@@ -147,6 +300,15 @@
    }
    {
+      name = "archy___archy_0.0.2.tgz";
+      path = fetchurl {
+        name = "archy___archy_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/archy/-/archy-0.0.2.tgz";
+        sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+      };
+    }
+    {
      name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz";
      path = fetchurl {
        name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz";
@@ -165,6 +327,15 @@
    }
    {
+      name = "argparse___argparse_0.1.16.tgz";
+      path = fetchurl {
+        name = "argparse___argparse_0.1.16.tgz";
+        url  = "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz";
+        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+      };
+    }
+    {
      name = "arr_diff___arr_diff_2.0.0.tgz";
      path = fetchurl {
        name = "arr_diff___arr_diff_2.0.0.tgz";
@@ -219,6 +390,15 @@
    }
    {
+      name = "array_filter___array_filter_0.0.1.tgz";
+      path = fetchurl {
+        name = "array_filter___array_filter_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz";
+        sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
+      };
+    }
+    {
      name = "array_find_index___array_find_index_1.0.2.tgz";
      path = fetchurl {
        name = "array_find_index___array_find_index_1.0.2.tgz";
@@ -228,6 +408,24 @@
    }
    {
+      name = "array_map___array_map_0.0.0.tgz";
+      path = fetchurl {
+        name = "array_map___array_map_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz";
+        sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
+      };
+    }
+    {
+      name = "array_reduce___array_reduce_0.0.0.tgz";
+      path = fetchurl {
+        name = "array_reduce___array_reduce_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz";
+        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
+      };
+    }
+    {
      name = "array_slice___array_slice_0.2.3.tgz";
      path = fetchurl {
        name = "array_slice___array_slice_0.2.3.tgz";
@@ -282,6 +480,24 @@
    }
    {
+      name = "asap___asap_2.0.6.tgz";
+      path = fetchurl {
+        name = "asap___asap_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    }
+    {
+      name = "asn1___asn1_0.1.11.tgz";
+      path = fetchurl {
+        name = "asn1___asn1_0.1.11.tgz";
+        url  = "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      };
+    }
+    {
      name = "asn1___asn1_0.2.4.tgz";
      path = fetchurl {
        name = "asn1___asn1_0.2.4.tgz";
@@ -300,6 +516,24 @@
    }
    {
+      name = "assert_plus___assert_plus_0.1.5.tgz";
+      path = fetchurl {
+        name = "assert_plus___assert_plus_0.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      };
+    }
+    {
+      name = "assert___assert_1.1.2.tgz";
+      path = fetchurl {
+        name = "assert___assert_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/assert/-/assert-1.1.2.tgz";
+        sha1 = "adaa04c46bb58c6dd1f294da3eb26e6228eb6e44";
+      };
+    }
+    {
      name = "assign_symbols___assign_symbols_1.0.0.tgz";
      path = fetchurl {
        name = "assign_symbols___assign_symbols_1.0.0.tgz";
@@ -309,11 +543,20 @@
    }
    {
-      name = "async_each___async_each_1.0.1.tgz";
+      name = "astw___astw_2.2.0.tgz";
+      path = fetchurl {
+        name = "astw___astw_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz";
+        sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
+      };
+    }
+    {
+      name = "async_each___async_each_1.0.3.tgz";
      path = fetchurl {
-        name = "async_each___async_each_1.0.1.tgz";
+        name = "async_each___async_each_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz";
-        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+        sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf";
      };
    }
@@ -336,11 +579,29 @@
    }
    {
-      name = "async___async_2.6.2.tgz";
+      name = "async___async_0.2.10.tgz";
+      path = fetchurl {
+        name = "async___async_0.2.10.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    }
+    {
+      name = "async___async_0.8.0.tgz";
      path = fetchurl {
-        name = "async___async_2.6.2.tgz";
+        name = "async___async_0.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-0.8.0.tgz";
-        sha1 = "18330ea7e6e313887f5d2f2a904bac6fe4dd5381";
+        sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112";
+      };
+    }
+    {
+      name = "async___async_0.9.2.tgz";
+      path = fetchurl {
+        name = "async___async_0.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz";
+        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
      };
    }
@@ -363,6 +624,15 @@
    }
    {
+      name = "aws_sign2___aws_sign2_0.5.0.tgz";
+      path = fetchurl {
+        name = "aws_sign2___aws_sign2_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      };
+    }
+    {
      name = "aws_sign2___aws_sign2_0.7.0.tgz";
      path = fetchurl {
        name = "aws_sign2___aws_sign2_0.7.0.tgz";
@@ -372,11 +642,47 @@
    }
    {
-      name = "aws4___aws4_1.8.0.tgz";
+      name = "aws_sign___aws_sign_0.3.0.tgz";
+      path = fetchurl {
+        name = "aws_sign___aws_sign_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sign/-/aws-sign-0.3.0.tgz";
+        sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
+      };
+    }
+    {
+      name = "aws4___aws4_1.9.1.tgz";
      path = fetchurl {
-        name = "aws4___aws4_1.8.0.tgz";
+        name = "aws4___aws4_1.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz";
-        sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
+        sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e";
+      };
+    }
+    {
+      name = "babel_runtime___babel_runtime_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_runtime___babel_runtime_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    }
+    {
+      name = "babel_types___babel_types_6.26.0.tgz";
+      path = fetchurl {
+        name = "babel_types___babel_types_6.26.0.tgz";
+        url  = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz";
+        sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
+      };
+    }
+    {
+      name = "babylon___babylon_6.18.0.tgz";
+      path = fetchurl {
+        name = "babylon___babylon_6.18.0.tgz";
+        url  = "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz";
+        sha1 = "af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3";
      };
    }
@@ -408,6 +714,15 @@
    }
    {
+      name = "base64_js___base64_js_0.0.8.tgz";
+      path = fetchurl {
+        name = "base64_js___base64_js_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz";
+        sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
+      };
+    }
+    {
      name = "base64id___base64id_1.0.0.tgz";
      path = fetchurl {
        name = "base64id___base64id_1.0.0.tgz";
@@ -462,11 +777,47 @@
    }
    {
-      name = "binary_extensions___binary_extensions_1.13.0.tgz";
+      name = "binary_extensions___binary_extensions_1.13.1.tgz";
+      path = fetchurl {
+        name = "binary_extensions___binary_extensions_1.13.1.tgz";
+        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz";
+        sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65";
+      };
+    }
+    {
+      name = "binary___binary_0.3.0.tgz";
+      path = fetchurl {
+        name = "binary___binary_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz";
+        sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
+      };
+    }
+    {
+      name = "binaryextensions___binaryextensions_1.0.1.tgz";
+      path = fetchurl {
+        name = "binaryextensions___binaryextensions_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-1.0.1.tgz";
+        sha1 = "1e637488b35b58bda5f4774bf96a5212a8c90755";
+      };
+    }
+    {
+      name = "bindings___bindings_1.5.0.tgz";
      path = fetchurl {
-        name = "binary_extensions___binary_extensions_1.13.0.tgz";
+        name = "bindings___bindings_1.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz";
-        sha1 = "9523e001306a32444b907423f1de2164222f6ab1";
+        sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df";
+      };
+    }
+    {
+      name = "bl___bl_0.9.5.tgz";
+      path = fetchurl {
+        name = "bl___bl_0.9.5.tgz";
+        url  = "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz";
+        sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
      };
    }
@@ -498,11 +849,11 @@
    }
    {
-      name = "body_parser___body_parser_1.18.3.tgz";
+      name = "body_parser___body_parser_1.19.0.tgz";
      path = fetchurl {
-        name = "body_parser___body_parser_1.18.3.tgz";
+        name = "body_parser___body_parser_1.19.0.tgz";
-        url  = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz";
+        url  = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz";
-        sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
+        sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a";
      };
    }
@@ -516,6 +867,69 @@
    }
    {
+      name = "boom___boom_0.4.2.tgz";
+      path = fetchurl {
+        name = "boom___boom_0.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz";
+        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      };
+    }
+    {
+      name = "bower_config___bower_config_0.5.3.tgz";
+      path = fetchurl {
+        name = "bower_config___bower_config_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/bower-config/-/bower-config-0.5.3.tgz";
+        sha1 = "98fc5b41a87870ef9cbb9297635cf81f5505fdb1";
+      };
+    }
+    {
+      name = "bower_endpoint_parser___bower_endpoint_parser_0.2.2.tgz";
+      path = fetchurl {
+        name = "bower_endpoint_parser___bower_endpoint_parser_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
+        sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
+      };
+    }
+    {
+      name = "bower_json___bower_json_0.4.0.tgz";
+      path = fetchurl {
+        name = "bower_json___bower_json_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/bower-json/-/bower-json-0.4.0.tgz";
+        sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
+      };
+    }
+    {
+      name = "bower_logger___bower_logger_0.2.2.tgz";
+      path = fetchurl {
+        name = "bower_logger___bower_logger_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/bower-logger/-/bower-logger-0.2.2.tgz";
+        sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
+      };
+    }
+    {
+      name = "bower_registry_client___bower_registry_client_0.2.4.tgz";
+      path = fetchurl {
+        name = "bower_registry_client___bower_registry_client_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/bower-registry-client/-/bower-registry-client-0.2.4.tgz";
+        sha1 = "269fc7e898b627fb939d1144a593254d7fbbeebc";
+      };
+    }
+    {
+      name = "bower___bower_1.3.8.tgz";
+      path = fetchurl {
+        name = "bower___bower_1.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/bower/-/bower-1.3.8.tgz";
+        sha1 = "afa3338a8a88a6e084c38112ea4a15998cbee3e6";
+      };
+    }
+    {
      name = "brace_expansion___brace_expansion_1.1.11.tgz";
      path = fetchurl {
        name = "brace_expansion___brace_expansion_1.1.11.tgz";
@@ -552,6 +966,51 @@
    }
    {
+      name = "browser_pack___browser_pack_2.0.1.tgz";
+      path = fetchurl {
+        name = "browser_pack___browser_pack_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/browser-pack/-/browser-pack-2.0.1.tgz";
+        sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
+      };
+    }
+    {
+      name = "browser_resolve___browser_resolve_1.2.4.tgz";
+      path = fetchurl {
+        name = "browser_resolve___browser_resolve_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.2.4.tgz";
+        sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
+      };
+    }
+    {
+      name = "browserify_shim___browserify_shim_2.0.10.tgz";
+      path = fetchurl {
+        name = "browserify_shim___browserify_shim_2.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-shim/-/browserify-shim-2.0.10.tgz";
+        sha1 = "74a0ed5b9b784a5a287906513a896d31f54a84b8";
+      };
+    }
+    {
+      name = "browserify_zlib___browserify_zlib_0.1.4.tgz";
+      path = fetchurl {
+        name = "browserify_zlib___browserify_zlib_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+      };
+    }
+    {
+      name = "browserify___browserify_3.46.1.tgz";
+      path = fetchurl {
+        name = "browserify___browserify_3.46.1.tgz";
+        url  = "https://registry.yarnpkg.com/browserify/-/browserify-3.46.1.tgz";
+        sha1 = "2c2e4a7f2f408178e78c223b5b57b37c2185ad8e";
+      };
+    }
+    {
      name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz";
      path = fetchurl {
        name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz";
@@ -579,6 +1038,42 @@
    }
    {
+      name = "buffer___buffer_2.1.13.tgz";
+      path = fetchurl {
+        name = "buffer___buffer_2.1.13.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-2.1.13.tgz";
+        sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355";
+      };
+    }
+    {
+      name = "buffers___buffers_0.1.1.tgz";
+      path = fetchurl {
+        name = "buffers___buffers_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz";
+        sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
+      };
+    }
+    {
+      name = "bufferstreams___bufferstreams_0.0.2.tgz";
+      path = fetchurl {
+        name = "bufferstreams___bufferstreams_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-0.0.2.tgz";
+        sha1 = "7ce8dff968bbac00b9e90158a2c41456f740abdd";
+      };
+    }
+    {
+      name = "builtins___builtins_0.0.7.tgz";
+      path = fetchurl {
+        name = "builtins___builtins_0.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz";
+        sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      };
+    }
+    {
      name = "bytes___bytes_2.2.0.tgz";
      path = fetchurl {
        name = "bytes___bytes_2.2.0.tgz";
@@ -597,11 +1092,11 @@
    }
    {
-      name = "bytes___bytes_3.0.0.tgz";
+      name = "bytes___bytes_3.1.0.tgz";
      path = fetchurl {
-        name = "bytes___bytes_3.0.0.tgz";
+        name = "bytes___bytes_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz";
-        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+        sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6";
      };
    }
@@ -633,6 +1128,15 @@
    }
    {
+      name = "camelcase___camelcase_1.2.1.tgz";
+      path = fetchurl {
+        name = "camelcase___camelcase_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    }
+    {
      name = "camelcase___camelcase_2.1.1.tgz";
      path = fetchurl {
        name = "camelcase___camelcase_2.1.1.tgz";
@@ -651,6 +1155,15 @@
    }
    {
+      name = "cardinal___cardinal_0.4.4.tgz";
+      path = fetchurl {
+        name = "cardinal___cardinal_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/cardinal/-/cardinal-0.4.4.tgz";
+        sha1 = "ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2";
+      };
+    }
+    {
      name = "caseless___caseless_0.12.0.tgz";
      path = fetchurl {
        name = "caseless___caseless_0.12.0.tgz";
@@ -660,6 +1173,42 @@
    }
    {
+      name = "caseless___caseless_0.8.0.tgz";
+      path = fetchurl {
+        name = "caseless___caseless_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/caseless/-/caseless-0.8.0.tgz";
+        sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
+      };
+    }
+    {
+      name = "center_align___center_align_0.1.3.tgz";
+      path = fetchurl {
+        name = "center_align___center_align_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    }
+    {
+      name = "chainsaw___chainsaw_0.1.0.tgz";
+      path = fetchurl {
+        name = "chainsaw___chainsaw_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz";
+        sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
+      };
+    }
+    {
+      name = "chalk___chalk_3.0.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
+        sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
+      };
+    }
+    {
      name = "chalk___chalk_0.5.1.tgz";
      path = fetchurl {
        name = "chalk___chalk_0.5.1.tgz";
@@ -678,6 +1227,33 @@
    }
    {
+      name = "chalk___chalk_0.4.0.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+      };
+    }
+    {
+      name = "character_parser___character_parser_2.2.0.tgz";
+      path = fetchurl {
+        name = "character_parser___character_parser_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz";
+        sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
+      };
+    }
+    {
+      name = "chmodr___chmodr_0.1.2.tgz";
+      path = fetchurl {
+        name = "chmodr___chmodr_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/chmodr/-/chmodr-0.1.2.tgz";
+        sha1 = "0dd8041c915087575bec383b47827bb7576a4fd6";
+      };
+    }
+    {
      name = "chokidar___chokidar_1.7.0.tgz";
      path = fetchurl {
        name = "chokidar___chokidar_1.7.0.tgz";
@@ -687,11 +1263,11 @@
    }
    {
-      name = "chownr___chownr_1.1.1.tgz";
+      name = "chownr___chownr_1.1.4.tgz";
      path = fetchurl {
-        name = "chownr___chownr_1.1.1.tgz";
+        name = "chownr___chownr_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz";
-        sha1 = "54726b8b8fff4df053c42187e801fb4412df1494";
+        sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b";
      };
    }
@@ -705,6 +1281,51 @@
    }
    {
+      name = "clean_css___clean_css_2.2.23.tgz";
+      path = fetchurl {
+        name = "clean_css___clean_css_2.2.23.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-2.2.23.tgz";
+        sha1 = "0590b5478b516c4903edc2d89bd3fdbdd286328c";
+      };
+    }
+    {
+      name = "clean_css___clean_css_4.2.3.tgz";
+      path = fetchurl {
+        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_color___cli_color_0.2.3.tgz";
+      path = fetchurl {
+        name = "cli_color___cli_color_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/cli-color/-/cli-color-0.2.3.tgz";
+        sha1 = "0a25ceae5a6a1602be7f77d28563c36700274e88";
+      };
+    }
+    {
+      name = "cli_color___cli_color_0.3.3.tgz";
+      path = fetchurl {
+        name = "cli_color___cli_color_0.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/cli-color/-/cli-color-0.3.3.tgz";
+        sha1 = "12d5bdd158ff8a0b0db401198913c03df069f6f5";
+      };
+    }
+    {
+      name = "cliui___cliui_2.1.0.tgz";
+      path = fetchurl {
+        name = "cliui___cliui_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    }
+    {
      name = "cliui___cliui_3.2.0.tgz";
      path = fetchurl {
        name = "cliui___cliui_3.2.0.tgz";
@@ -714,6 +1335,15 @@
    }
    {
+      name = "clone_buffer___clone_buffer_1.0.0.tgz";
+      path = fetchurl {
+        name = "clone_buffer___clone_buffer_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
+        sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
+      };
+    }
+    {
      name = "clone_stats___clone_stats_0.0.1.tgz";
      path = fetchurl {
        name = "clone_stats___clone_stats_0.0.1.tgz";
@@ -723,6 +1353,15 @@
    }
    {
+      name = "clone_stats___clone_stats_1.0.0.tgz";
+      path = fetchurl {
+        name = "clone_stats___clone_stats_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
+        sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
+      };
+    }
+    {
      name = "clone___clone_0.2.0.tgz";
      path = fetchurl {
        name = "clone___clone_0.2.0.tgz";
@@ -741,6 +1380,24 @@
    }
    {
+      name = "clone___clone_2.1.2.tgz";
+      path = fetchurl {
+        name = "clone___clone_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
+        sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
+      };
+    }
+    {
+      name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
+      path = fetchurl {
+        name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
+        sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
+      };
+    }
+    {
      name = "code_point_at___code_point_at_1.1.0.tgz";
      path = fetchurl {
        name = "code_point_at___code_point_at_1.1.0.tgz";
@@ -768,6 +1425,15 @@
    }
    {
+      name = "coffeescript___coffeescript_1.12.7.tgz";
+      path = fetchurl {
+        name = "coffeescript___coffeescript_1.12.7.tgz";
+        url  = "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz";
+        sha1 = "e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27";
+      };
+    }
+    {
      name = "collection_visit___collection_visit_1.0.0.tgz";
      path = fetchurl {
        name = "collection_visit___collection_visit_1.0.0.tgz";
@@ -777,6 +1443,24 @@
    }
    {
+      name = "color_convert___color_convert_2.0.1.tgz";
+      path = fetchurl {
+        name = "color_convert___color_convert_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz";
+        sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3";
+      };
+    }
+    {
+      name = "color_name___color_name_1.1.4.tgz";
+      path = fetchurl {
+        name = "color_name___color_name_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz";
+        sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2";
+      };
+    }
+    {
      name = "color_support___color_support_1.1.3.tgz";
      path = fetchurl {
        name = "color_support___color_support_1.1.3.tgz";
@@ -786,29 +1470,65 @@
    }
    {
-      name = "colors___colors_1.3.3.tgz";
+      name = "colors___colors_1.4.0.tgz";
+      path = fetchurl {
+        name = "colors___colors_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz";
+        sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78";
+      };
+    }
+    {
+      name = "combine_source_map___combine_source_map_0.3.0.tgz";
+      path = fetchurl {
+        name = "combine_source_map___combine_source_map_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.3.0.tgz";
+        sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
+      };
+    }
+    {
+      name = "combined_stream___combined_stream_1.0.8.tgz";
+      path = fetchurl {
+        name = "combined_stream___combined_stream_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f";
+      };
+    }
+    {
+      name = "combined_stream___combined_stream_0.0.7.tgz";
      path = fetchurl {
-        name = "colors___colors_1.3.3.tgz";
+        name = "combined_stream___combined_stream_0.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz";
-        sha1 = "39e005d546afe01e01f9c4ca8fa50f686a01205d";
+        sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
      };
    }
    {
-      name = "combined_stream___combined_stream_1.0.7.tgz";
+      name = "commander___commander_2.2.0.tgz";
      path = fetchurl {
-        name = "combined_stream___combined_stream_1.0.7.tgz";
+        name = "commander___commander_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz";
-        sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
+        sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df";
      };
    }
    {
-      name = "commander___commander_2.17.1.tgz";
+      name = "commander___commander_2.20.3.tgz";
      path = fetchurl {
-        name = "commander___commander_2.17.1.tgz";
+        name = "commander___commander_2.20.3.tgz";
-        url  = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
-        sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf";
+        sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
+      };
+    }
+    {
+      name = "commondir___commondir_0.0.1.tgz";
+      path = fetchurl {
+        name = "commondir___commondir_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/commondir/-/commondir-0.0.1.tgz";
+        sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
      };
    }
@@ -840,6 +1560,15 @@
    }
    {
+      name = "component_emitter___component_emitter_1.3.0.tgz";
+      path = fetchurl {
+        name = "component_emitter___component_emitter_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz";
+        sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0";
+      };
+    }
+    {
      name = "component_inherit___component_inherit_0.0.3.tgz";
      path = fetchurl {
        name = "component_inherit___component_inherit_0.0.3.tgz";
@@ -858,11 +1587,56 @@
    }
    {
-      name = "connect___connect_3.6.6.tgz";
+      name = "concat_stream___concat_stream_1.4.11.tgz";
+      path = fetchurl {
+        name = "concat_stream___concat_stream_1.4.11.tgz";
+        url  = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz";
+        sha1 = "1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f";
+      };
+    }
+    {
+      name = "concat_with_sourcemaps___concat_with_sourcemaps_1.1.0.tgz";
      path = fetchurl {
-        name = "connect___connect_3.6.6.tgz";
+        name = "concat_with_sourcemaps___concat_with_sourcemaps_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz";
-        sha1 = "09eff6c55af7236e137135a72574858b6786f524";
+        sha1 = "d4ea93f05ae25790951b99e7b3b09e3908a4082e";
+      };
+    }
+    {
+      name = "configstore___configstore_0.3.2.tgz";
+      path = fetchurl {
+        name = "configstore___configstore_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/configstore/-/configstore-0.3.2.tgz";
+        sha1 = "25e4c16c3768abf75c5a65bc61761f495055b459";
+      };
+    }
+    {
+      name = "configstore___configstore_0.2.3.tgz";
+      path = fetchurl {
+        name = "configstore___configstore_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/configstore/-/configstore-0.2.3.tgz";
+        sha1 = "b1bdc4ad823a25423dc15d220fcc1ae1d7efab02";
+      };
+    }
+    {
+      name = "connect___connect_3.7.0.tgz";
+      path = fetchurl {
+        name = "connect___connect_3.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz";
+        sha1 = "5d49348910caa5e07a01800b030d0c35f20484f8";
+      };
+    }
+    {
+      name = "console_browserify___console_browserify_1.0.3.tgz";
+      path = fetchurl {
+        name = "console_browserify___console_browserify_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.0.3.tgz";
+        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
      };
    }
@@ -876,6 +1650,24 @@
    }
    {
+      name = "constantinople___constantinople_3.1.2.tgz";
+      path = fetchurl {
+        name = "constantinople___constantinople_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz";
+        sha1 = "d45ed724f57d3d10500017a7d3a889c1381ae647";
+      };
+    }
+    {
+      name = "constants_browserify___constants_browserify_0.0.1.tgz";
+      path = fetchurl {
+        name = "constants_browserify___constants_browserify_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-0.0.1.tgz";
+        sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+      };
+    }
+    {
      name = "content_type___content_type_1.0.4.tgz";
      path = fetchurl {
        name = "content_type___content_type_1.0.4.tgz";
@@ -885,6 +1677,51 @@
    }
    {
+      name = "convert_source_map___convert_source_map_0.4.1.tgz";
+      path = fetchurl {
+        name = "convert_source_map___convert_source_map_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.4.1.tgz";
+        sha1 = "f919a0099fe31f80fc5a1d0eb303161b394070c7";
+      };
+    }
+    {
+      name = "convert_source_map___convert_source_map_1.7.0.tgz";
+      path = fetchurl {
+        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";
+      };
+    }
+    {
+      name = "convert_source_map___convert_source_map_0.3.5.tgz";
+      path = fetchurl {
+        name = "convert_source_map___convert_source_map_0.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz";
+        sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
+      };
+    }
+    {
+      name = "convert_source_map___convert_source_map_1.1.3.tgz";
+      path = fetchurl {
+        name = "convert_source_map___convert_source_map_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz";
+        sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
+      };
+    }
+    {
+      name = "cookie_jar___cookie_jar_0.3.0.tgz";
+      path = fetchurl {
+        name = "cookie_jar___cookie_jar_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz";
+        sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
+      };
+    }
+    {
      name = "cookie___cookie_0.3.1.tgz";
      path = fetchurl {
        name = "cookie___cookie_0.3.1.tgz";
@@ -903,11 +1740,11 @@
    }
    {
-      name = "core_js___core_js_2.6.5.tgz";
+      name = "core_js___core_js_2.6.11.tgz";
      path = fetchurl {
-        name = "core_js___core_js_2.6.5.tgz";
+        name = "core_js___core_js_2.6.11.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz";
-        sha1 = "44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895";
+        sha1 = "38831469f9922bded8ee21c9dc46985e0399308c";
      };
    }
@@ -930,6 +1767,33 @@
    }
    {
+      name = "cryptiles___cryptiles_0.2.2.tgz";
+      path = fetchurl {
+        name = "cryptiles___cryptiles_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz";
+        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      };
+    }
+    {
+      name = "crypto_browserify___crypto_browserify_1.0.9.tgz";
+      path = fetchurl {
+        name = "crypto_browserify___crypto_browserify_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
+        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+      };
+    }
+    {
+      name = "ctype___ctype_0.5.3.tgz";
+      path = fetchurl {
+        name = "ctype___ctype_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz";
+        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      };
+    }
+    {
      name = "currently_unhandled___currently_unhandled_0.4.1.tgz";
      path = fetchurl {
        name = "currently_unhandled___currently_unhandled_0.4.1.tgz";
@@ -948,6 +1812,24 @@
    }
    {
+      name = "d___d_1.0.1.tgz";
+      path = fetchurl {
+        name = "d___d_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz";
+        sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a";
+      };
+    }
+    {
+      name = "d___d_0.1.1.tgz";
+      path = fetchurl {
+        name = "d___d_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz";
+        sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
+      };
+    }
+    {
      name = "dashdash___dashdash_1.14.1.tgz";
      path = fetchurl {
        name = "dashdash___dashdash_1.14.1.tgz";
@@ -975,6 +1857,15 @@
    }
    {
+      name = "deap___deap_1.0.1.tgz";
+      path = fetchurl {
+        name = "deap___deap_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/deap/-/deap-1.0.1.tgz";
+        sha1 = "0646e9e1a095ffe8a9e404d68d1f76dcf57e66fb";
+      };
+    }
+    {
      name = "debug___debug_2.2.0.tgz";
      path = fetchurl {
        name = "debug___debug_2.2.0.tgz";
@@ -1029,6 +1920,24 @@
    }
    {
+      name = "decompress_zip___decompress_zip_0.0.8.tgz";
+      path = fetchurl {
+        name = "decompress_zip___decompress_zip_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/decompress-zip/-/decompress-zip-0.0.8.tgz";
+        sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
+      };
+    }
+    {
+      name = "deep_equal___deep_equal_0.1.2.tgz";
+      path = fetchurl {
+        name = "deep_equal___deep_equal_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-0.1.2.tgz";
+        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+      };
+    }
+    {
      name = "deep_extend___deep_extend_0.6.0.tgz";
      path = fetchurl {
        name = "deep_extend___deep_extend_0.6.0.tgz";
@@ -1038,6 +1947,15 @@
    }
    {
+      name = "deep_extend___deep_extend_0.2.11.tgz";
+      path = fetchurl {
+        name = "deep_extend___deep_extend_0.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.2.11.tgz";
+        sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
+      };
+    }
+    {
      name = "deep_is___deep_is_0.1.3.tgz";
      path = fetchurl {
        name = "deep_is___deep_is_0.1.3.tgz";
@@ -1083,6 +2001,24 @@
    }
    {
+      name = "defined___defined_0.0.0.tgz";
+      path = fetchurl {
+        name = "defined___defined_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/defined/-/defined-0.0.0.tgz";
+        sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
+      };
+    }
+    {
+      name = "delayed_stream___delayed_stream_0.0.5.tgz";
+      path = fetchurl {
+        name = "delayed_stream___delayed_stream_0.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz";
+        sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      };
+    }
+    {
      name = "delayed_stream___delayed_stream_1.0.0.tgz";
      path = fetchurl {
        name = "delayed_stream___delayed_stream_1.0.0.tgz";
@@ -1119,6 +2055,33 @@
    }
    {
+      name = "deps_sort___deps_sort_0.1.2.tgz";
+      path = fetchurl {
+        name = "deps_sort___deps_sort_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/deps-sort/-/deps-sort-0.1.2.tgz";
+        sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
+      };
+    }
+    {
+      name = "derequire___derequire_0.8.0.tgz";
+      path = fetchurl {
+        name = "derequire___derequire_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/derequire/-/derequire-0.8.0.tgz";
+        sha1 = "c1f7f1da2cede44adede047378f03f444e9c4c0d";
+      };
+    }
+    {
+      name = "destroy___destroy_1.0.4.tgz";
+      path = fetchurl {
+        name = "destroy___destroy_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    }
+    {
      name = "detect_file___detect_file_1.0.0.tgz";
      path = fetchurl {
        name = "detect_file___detect_file_1.0.0.tgz";
@@ -1137,6 +2100,15 @@
    }
    {
+      name = "detective___detective_3.1.0.tgz";
+      path = fetchurl {
+        name = "detective___detective_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/detective/-/detective-3.1.0.tgz";
+        sha1 = "77782444ab752b88ca1be2e9d0a0395f1da25eed";
+      };
+    }
+    {
      name = "di___di_0.0.1.tgz";
      path = fetchurl {
        name = "di___di_0.0.1.tgz";
@@ -1146,6 +2118,15 @@
    }
    {
+      name = "doctypes___doctypes_1.1.0.tgz";
+      path = fetchurl {
+        name = "doctypes___doctypes_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz";
+        sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9";
+      };
+    }
+    {
      name = "dom_serialize___dom_serialize_2.2.1.tgz";
      path = fetchurl {
        name = "dom_serialize___dom_serialize_2.2.1.tgz";
@@ -1155,6 +2136,15 @@
    }
    {
+      name = "domain_browser___domain_browser_1.1.7.tgz";
+      path = fetchurl {
+        name = "domain_browser___domain_browser_1.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz";
+        sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc";
+      };
+    }
+    {
      name = "duplexer2___duplexer2_0.0.2.tgz";
      path = fetchurl {
        name = "duplexer2___duplexer2_0.0.2.tgz";
@@ -1173,6 +2163,15 @@
    }
    {
+      name = "duplexify___duplexify_3.7.1.tgz";
+      path = fetchurl {
+        name = "duplexify___duplexify_3.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz";
+        sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309";
+      };
+    }
+    {
      name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
      path = fetchurl {
        name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
@@ -1200,6 +2199,15 @@
    }
    {
+      name = "end_of_stream___end_of_stream_1.4.4.tgz";
+      path = fetchurl {
+        name = "end_of_stream___end_of_stream_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz";
+        sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0";
+      };
+    }
+    {
      name = "end_of_stream___end_of_stream_0.1.5.tgz";
      path = fetchurl {
        name = "end_of_stream___end_of_stream_0.1.5.tgz";
@@ -1254,6 +2262,69 @@
    }
    {
+      name = "es5_ext___es5_ext_0.10.53.tgz";
+      path = fetchurl {
+        name = "es5_ext___es5_ext_0.10.53.tgz";
+        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1";
+      };
+    }
+    {
+      name = "es5_ext___es5_ext_0.9.2.tgz";
+      path = fetchurl {
+        name = "es5_ext___es5_ext_0.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.9.2.tgz";
+        sha1 = "d2e309d1f223b0718648835acf5b8823a8061f8a";
+      };
+    }
+    {
+      name = "es6_iterator___es6_iterator_0.1.3.tgz";
+      path = fetchurl {
+        name = "es6_iterator___es6_iterator_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-0.1.3.tgz";
+        sha1 = "d6f58b8c4fc413c249b4baa19768f8e4d7c8944e";
+      };
+    }
+    {
+      name = "es6_iterator___es6_iterator_2.0.3.tgz";
+      path = fetchurl {
+        name = "es6_iterator___es6_iterator_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+      };
+    }
+    {
+      name = "es6_symbol___es6_symbol_3.1.3.tgz";
+      path = fetchurl {
+        name = "es6_symbol___es6_symbol_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18";
+      };
+    }
+    {
+      name = "es6_symbol___es6_symbol_2.0.1.tgz";
+      path = fetchurl {
+        name = "es6_symbol___es6_symbol_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-2.0.1.tgz";
+        sha1 = "761b5c67cfd4f1d18afb234f691d678682cb3bf3";
+      };
+    }
+    {
+      name = "es6_weak_map___es6_weak_map_0.1.4.tgz";
+      path = fetchurl {
+        name = "es6_weak_map___es6_weak_map_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-0.1.4.tgz";
+        sha1 = "706cef9e99aa236ba7766c239c8b9e286ea7d228";
+      };
+    }
+    {
      name = "escape_html___escape_html_1.0.3.tgz";
      path = fetchurl {
        name = "escape_html___escape_html_1.0.3.tgz";
@@ -1281,6 +2352,33 @@
    }
    {
+      name = "escodegen___escodegen_1.1.0.tgz";
+      path = fetchurl {
+        name = "escodegen___escodegen_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.1.0.tgz";
+        sha1 = "c663923f6e20aad48d0c0fa49f31c6d4f49360cf";
+      };
+    }
+    {
+      name = "escope___escope_0.0.16.tgz";
+      path = fetchurl {
+        name = "escope___escope_0.0.16.tgz";
+        url  = "https://registry.yarnpkg.com/escope/-/escope-0.0.16.tgz";
+        sha1 = "418c7a0afca721dafe659193fd986283e746538f";
+      };
+    }
+    {
+      name = "esprima_fb___esprima_fb_3001.0001.0000_dev_harmony_fb.tgz";
+      path = fetchurl {
+        name = "esprima_fb___esprima_fb_3001.0001.0000_dev_harmony_fb.tgz";
+        url  = "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
+        sha1 = "b77d37abcd38ea0b77426bb8bc2922ce6b426411";
+      };
+    }
+    {
      name = "esprima___esprima_2.7.3.tgz";
      path = fetchurl {
        name = "esprima___esprima_2.7.3.tgz";
@@ -1299,6 +2397,33 @@
    }
    {
+      name = "esprima___esprima_1.0.4.tgz";
+      path = fetchurl {
+        name = "esprima___esprima_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+      };
+    }
+    {
+      name = "esrefactor___esrefactor_0.1.0.tgz";
+      path = fetchurl {
+        name = "esrefactor___esrefactor_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/esrefactor/-/esrefactor-0.1.0.tgz";
+        sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
+      };
+    }
+    {
+      name = "estraverse___estraverse_5.0.0.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz";
+        sha1 = "ac81750b482c11cca26e4b07e83ed8f75fbcdc22";
+      };
+    }
+    {
      name = "estraverse___estraverse_1.9.3.tgz";
      path = fetchurl {
        name = "estraverse___estraverse_1.9.3.tgz";
@@ -1308,11 +2433,83 @@
    }
    {
-      name = "esutils___esutils_2.0.2.tgz";
+      name = "estraverse___estraverse_0.0.4.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-0.0.4.tgz";
+        sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
+      };
+    }
+    {
+      name = "estraverse___estraverse_1.5.1.tgz";
+      path = fetchurl {
+        name = "estraverse___estraverse_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+      };
+    }
+    {
+      name = "esutils___esutils_2.0.3.tgz";
+      path = fetchurl {
+        name = "esutils___esutils_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz";
+        sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64";
+      };
+    }
+    {
+      name = "esutils___esutils_1.0.0.tgz";
+      path = fetchurl {
+        name = "esutils___esutils_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      };
+    }
+    {
+      name = "etag___etag_1.7.0.tgz";
+      path = fetchurl {
+        name = "etag___etag_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz";
+        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+      };
+    }
+    {
+      name = "event_emitter___event_emitter_0.2.2.tgz";
      path = fetchurl {
-        name = "esutils___esutils_2.0.2.tgz";
+        name = "event_emitter___event_emitter_0.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.2.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+        sha1 = "c81e3724eb55407c5a0d5ee3299411f700f54291";
+      };
+    }
+    {
+      name = "event_emitter___event_emitter_0.3.5.tgz";
+      path = fetchurl {
+        name = "event_emitter___event_emitter_0.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+      };
+    }
+    {
+      name = "event_stream___event_stream_4.0.1.tgz";
+      path = fetchurl {
+        name = "event_stream___event_stream_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz";
+        sha1 = "4092808ec995d0dd75ea4580c1df6a74db2cde65";
+      };
+    }
+    {
+      name = "event_stream___event_stream_3.3.2.tgz";
+      path = fetchurl {
+        name = "event_stream___event_stream_3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.2.tgz";
+        sha1 = "3cc310feb1f28d2f62b2a085d736a9ef566378b8";
      };
    }
@@ -1326,11 +2523,20 @@
    }
    {
-      name = "eventemitter3___eventemitter3_3.1.0.tgz";
+      name = "eventemitter3___eventemitter3_4.0.0.tgz";
+      path = fetchurl {
+        name = "eventemitter3___eventemitter3_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz";
+        sha1 = "d65176163887ee59f386d64c82610b696a4a74eb";
+      };
+    }
+    {
+      name = "events___events_1.0.2.tgz";
      path = fetchurl {
-        name = "eventemitter3___eventemitter3_3.1.0.tgz";
+        name = "events___events_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-1.0.2.tgz";
-        sha1 = "090b4d6cdbd645ed10bf750d4b5407942d7ba163";
+        sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
      };
    }
@@ -1389,6 +2595,15 @@
    }
    {
+      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";
@@ -1461,20 +2676,20 @@
    }
    {
-      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";
+        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
      };
    }
    {
-      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";
+        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.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        sha1 = "874bf69c6f404c2b5d99c481341399fd55892633";
      };
    }
@@ -1497,6 +2712,15 @@
    }
    {
+      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+      path = fetchurl {
+        name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd";
+      };
+    }
+    {
      name = "filename_regex___filename_regex_2.0.1.tgz";
      path = fetchurl {
        name = "filename_regex___filename_regex_2.0.1.tgz";
@@ -1524,11 +2748,11 @@
    }
    {
-      name = "finalhandler___finalhandler_1.1.0.tgz";
+      name = "finalhandler___finalhandler_1.1.2.tgz";
      path = fetchurl {
-        name = "finalhandler___finalhandler_1.1.0.tgz";
+        name = "finalhandler___finalhandler_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz";
-        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
+        sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d";
      };
    }
@@ -1560,11 +2784,11 @@
    }
    {
-      name = "fined___fined_1.1.1.tgz";
+      name = "fined___fined_1.2.0.tgz";
      path = fetchurl {
-        name = "fined___fined_1.1.1.tgz";
+        name = "fined___fined_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz";
-        sha1 = "95d88ff329123dd1a6950fdfcd321f746271e01f";
+        sha1 = "d00beccf1aa2b475d16d423b0238b713a2c4a37b";
      };
    }
@@ -1578,6 +2802,15 @@
    }
    {
+      name = "fixtures2js___fixtures2js_0.0.0.tgz";
+      path = fetchurl {
+        name = "fixtures2js___fixtures2js_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fixtures2js/-/fixtures2js-0.0.0.tgz";
+        sha1 = "602f7964c5b2963fe73224c8e4a3607d75c1b34f";
+      };
+    }
+    {
      name = "flagged_respawn___flagged_respawn_1.0.1.tgz";
      path = fetchurl {
        name = "flagged_respawn___flagged_respawn_1.0.1.tgz";
@@ -1587,11 +2820,11 @@
    }
    {
-      name = "follow_redirects___follow_redirects_1.7.0.tgz";
+      name = "follow_redirects___follow_redirects_1.11.0.tgz";
      path = fetchurl {
-        name = "follow_redirects___follow_redirects_1.7.0.tgz";
+        name = "follow_redirects___follow_redirects_1.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz";
-        sha1 = "489ebc198dc0e7f64167bd23b03c4c19b5784c76";
+        sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb";
      };
    }
@@ -1623,6 +2856,15 @@
    }
    {
+      name = "forever_agent___forever_agent_0.5.2.tgz";
+      path = fetchurl {
+        name = "forever_agent___forever_agent_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz";
+        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      };
+    }
+    {
      name = "forever_agent___forever_agent_0.6.1.tgz";
      path = fetchurl {
        name = "forever_agent___forever_agent_0.6.1.tgz";
@@ -1632,6 +2874,33 @@
    }
    {
+      name = "fork_stream___fork_stream_0.0.4.tgz";
+      path = fetchurl {
+        name = "fork_stream___fork_stream_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/fork-stream/-/fork-stream-0.0.4.tgz";
+        sha1 = "db849fce77f6708a5f8f386ae533a0907b54ae70";
+      };
+    }
+    {
+      name = "form_data___form_data_0.1.4.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      };
+    }
+    {
+      name = "form_data___form_data_0.2.0.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-0.2.0.tgz";
+        sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+      };
+    }
+    {
      name = "form_data___form_data_2.3.3.tgz";
      path = fetchurl {
        name = "form_data___form_data_2.3.3.tgz";
@@ -1650,6 +2919,15 @@
    }
    {
+      name = "fresh___fresh_0.3.0.tgz";
+      path = fetchurl {
+        name = "fresh___fresh_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz";
+        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+      };
+    }
+    {
      name = "from___from_0.1.7.tgz";
      path = fetchurl {
        name = "from___from_0.1.7.tgz";
@@ -1668,11 +2946,11 @@
    }
    {
-      name = "fs_minipass___fs_minipass_1.2.5.tgz";
+      name = "fs_minipass___fs_minipass_1.2.7.tgz";
      path = fetchurl {
-        name = "fs_minipass___fs_minipass_1.2.5.tgz";
+        name = "fs_minipass___fs_minipass_1.2.7.tgz";
-        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha1 = "06c277218454ec288df77ada54a03b8702aacb9d";
+        sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7";
      };
    }
@@ -1686,20 +2964,38 @@
    }
    {
-      name = "fsevents___fsevents_1.2.7.tgz";
+      name = "fsevents___fsevents_1.2.12.tgz";
+      path = fetchurl {
+        name = "fsevents___fsevents_1.2.12.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz";
+        sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c";
+      };
+    }
+    {
+      name = "fstream_ignore___fstream_ignore_0.0.10.tgz";
+      path = fetchurl {
+        name = "fstream_ignore___fstream_ignore_0.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-0.0.10.tgz";
+        sha1 = "b10f8f522cc55415f80b41f7d3a32e6cba254e8c";
+      };
+    }
+    {
+      name = "fstream___fstream_1.0.12.tgz";
      path = fetchurl {
-        name = "fsevents___fsevents_1.2.7.tgz";
+        name = "fstream___fstream_1.0.12.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz";
-        sha1 = "4851b664a3783e52003b3c66eb0eee1074933aa4";
+        sha1 = "4e8ba8ee2d48be4f7d0de505455548eae5932045";
      };
    }
    {
-      name = "fstream___fstream_1.0.11.tgz";
+      name = "fstream___fstream_0.1.31.tgz";
      path = fetchurl {
-        name = "fstream___fstream_1.0.11.tgz";
+        name = "fstream___fstream_0.1.31.tgz";
-        url  = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz";
-        sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
+        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
      };
    }
@@ -1839,11 +3135,20 @@
    }
    {
-      name = "glob___glob_7.1.3.tgz";
+      name = "glob___glob_6.0.4.tgz";
      path = fetchurl {
-        name = "glob___glob_7.1.3.tgz";
+        name = "glob___glob_6.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz";
-        sha1 = "3960832d3f1574108342dafd3a67b332c0969df1";
+        sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
+      };
+    }
+    {
+      name = "glob___glob_7.1.6.tgz";
+      path = fetchurl {
+        name = "glob___glob_7.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
+        sha1 = "141f33b81a7c2492e125594307480c46679278a6";
      };
    }
@@ -1857,6 +3162,24 @@
    }
    {
+      name = "glob___glob_3.2.11.tgz";
+      path = fetchurl {
+        name = "glob___glob_3.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      };
+    }
+    {
+      name = "glob___glob_4.0.6.tgz";
+      path = fetchurl {
+        name = "glob___glob_4.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-4.0.6.tgz";
+        sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
+      };
+    }
+    {
      name = "global_modules___global_modules_1.0.0.tgz";
      path = fetchurl {
        name = "global_modules___global_modules_1.0.0.tgz";
@@ -1875,11 +3198,11 @@
    }
    {
-      name = "globule___globule_1.2.1.tgz";
+      name = "globule___globule_1.3.1.tgz";
      path = fetchurl {
-        name = "globule___globule_1.2.1.tgz";
+        name = "globule___globule_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/globule/-/globule-1.3.1.tgz";
-        sha1 = "5dffb1b191f22d20797a9369b49eab4e9839696d";
+        sha1 = "90a25338f22b7fbeb527cee63c629aea754d33b9";
      };
    }
@@ -1902,20 +3225,29 @@
    }
    {
-      name = "graceful_fs___graceful_fs_3.0.11.tgz";
+      name = "got___got_3.3.1.tgz";
      path = fetchurl {
-        name = "graceful_fs___graceful_fs_3.0.11.tgz";
+        name = "got___got_3.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/got/-/got-3.3.1.tgz";
-        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
      };
    }
    {
-      name = "graceful_fs___graceful_fs_4.1.15.tgz";
+      name = "graceful_fs___graceful_fs_3.0.12.tgz";
      path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.1.15.tgz";
+        name = "graceful_fs___graceful_fs_3.0.12.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz";
-        sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00";
+        sha1 = "0034947ce9ed695ec8ab0b854bc919e82b1ffaef";
+      };
+    }
+    {
+      name = "graceful_fs___graceful_fs_4.2.3.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
      };
    }
@@ -1929,11 +3261,164 @@
    }
    {
-      name = "guanlecoja___guanlecoja_0.8.8.tgz";
+      name = "graceful_fs___graceful_fs_2.0.3.tgz";
+      path = fetchurl {
+        name = "graceful_fs___graceful_fs_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz";
+        sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+      };
+    }
+    {
+      name = "guanlecoja___guanlecoja_0.9.2.tgz";
+      path = fetchurl {
+        name = "guanlecoja___guanlecoja_0.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/guanlecoja/-/guanlecoja-0.9.2.tgz";
+        sha1 = "03febe92d9e7575a633b4d5ad8d19f5ee1cdf326";
+      };
+    }
+    {
+      name = "gulp_angular_templatecache___gulp_angular_templatecache_1.9.1.tgz";
+      path = fetchurl {
+        name = "gulp_angular_templatecache___gulp_angular_templatecache_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-angular-templatecache/-/gulp-angular-templatecache-1.9.1.tgz";
+        sha1 = "60f631e97aaaa765d942e37042e4bfbb1a5df244";
+      };
+    }
+    {
+      name = "gulp_bower_deps___gulp_bower_deps_0.3.3.tgz";
+      path = fetchurl {
+        name = "gulp_bower_deps___gulp_bower_deps_0.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-bower-deps/-/gulp-bower-deps-0.3.3.tgz";
+        sha1 = "2109fe3fbee35069f67312bb977e591d890296cd";
+      };
+    }
+    {
+      name = "gulp_browserify___gulp_browserify_0.5.1.tgz";
+      path = fetchurl {
+        name = "gulp_browserify___gulp_browserify_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-browserify/-/gulp-browserify-0.5.1.tgz";
+        sha1 = "820108ac2554a954adb8be17d23958b0c04be083";
+      };
+    }
+    {
+      name = "gulp_cached___gulp_cached_1.1.1.tgz";
+      path = fetchurl {
+        name = "gulp_cached___gulp_cached_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-cached/-/gulp-cached-1.1.1.tgz";
+        sha1 = "fe7cd4f87f37601e6073cfedee5c2bdaf8b6acce";
+      };
+    }
+    {
+      name = "gulp_clean_css___gulp_clean_css_2.4.0.tgz";
+      path = fetchurl {
+        name = "gulp_clean_css___gulp_clean_css_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-clean-css/-/gulp-clean-css-2.4.0.tgz";
+        sha1 = "2ae48109fe83ccc967ff5ad53c044949a4863b36";
+      };
+    }
+    {
+      name = "gulp_coffee___gulp_coffee_2.3.5.tgz";
+      path = fetchurl {
+        name = "gulp_coffee___gulp_coffee_2.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-coffee/-/gulp-coffee-2.3.5.tgz";
+        sha1 = "8c64e9ac884e1bab4e20b66ac7c386a816859041";
+      };
+    }
+    {
+      name = "gulp_concat___gulp_concat_2.6.0.tgz";
+      path = fetchurl {
+        name = "gulp_concat___gulp_concat_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.0.tgz";
+        sha1 = "585cfb115411f348773131140566b6a81c69cb91";
+      };
+    }
+    {
+      name = "gulp_concat___gulp_concat_2.6.1.tgz";
+      path = fetchurl {
+        name = "gulp_concat___gulp_concat_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz";
+        sha1 = "633d16c95d88504628ad02665663cee5a4793353";
+      };
+    }
+    {
+      name = "gulp_fixtures2js___gulp_fixtures2js_0.0.1.tgz";
+      path = fetchurl {
+        name = "gulp_fixtures2js___gulp_fixtures2js_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-fixtures2js/-/gulp-fixtures2js-0.0.1.tgz";
+        sha1 = "4a3cbb4404bdfab92f7d2b6e09de2bfd0ae78506";
+      };
+    }
+    {
+      name = "gulp_footer___gulp_footer_1.0.5.tgz";
+      path = fetchurl {
+        name = "gulp_footer___gulp_footer_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-footer/-/gulp-footer-1.0.5.tgz";
+        sha1 = "e84ca777e266be7bbc2d45d2df0e7eba8dfa3e54";
+      };
+    }
+    {
+      name = "gulp_footer___gulp_footer_1.1.2.tgz";
+      path = fetchurl {
+        name = "gulp_footer___gulp_footer_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-footer/-/gulp-footer-1.1.2.tgz";
+        sha1 = "7fe28324ec67e3d618d31e0f5ea2ee5b454f6877";
+      };
+    }
+    {
+      name = "gulp_header___gulp_header_1.8.2.tgz";
+      path = fetchurl {
+        name = "gulp_header___gulp_header_1.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.2.tgz";
+        sha1 = "3ab222f53719d2d03d81d9134252fe7d52425aa4";
+      };
+    }
+    {
+      name = "gulp_header___gulp_header_1.8.12.tgz";
+      path = fetchurl {
+        name = "gulp_header___gulp_header_1.8.12.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz";
+        sha1 = "ad306be0066599127281c4f8786660e705080a84";
+      };
+    }
+    {
+      name = "gulp_help___gulp_help_1.6.1.tgz";
+      path = fetchurl {
+        name = "gulp_help___gulp_help_1.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-help/-/gulp-help-1.6.1.tgz";
+        sha1 = "261db186e18397fef3f6a2c22e9c315bfa88ae0c";
+      };
+    }
+    {
+      name = "gulp_if___gulp_if_2.0.2.tgz";
      path = fetchurl {
-        name = "guanlecoja___guanlecoja_0.8.8.tgz";
+        name = "gulp_if___gulp_if_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/guanlecoja/-/guanlecoja-0.8.8.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-if/-/gulp-if-2.0.2.tgz";
-        sha1 = "210099a9f4ea9bf80d78fda730226f7862478a26";
+        sha1 = "a497b7e7573005041caa2bc8b7dda3c80444d629";
+      };
+    }
+    {
+      name = "gulp_less___gulp_less_1.3.9.tgz";
+      path = fetchurl {
+        name = "gulp_less___gulp_less_1.3.9.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-less/-/gulp-less-1.3.9.tgz";
+        sha1 = "e129750f236693ead5b522af311cc33eeff1910e";
      };
    }
@@ -1947,6 +3432,24 @@
    }
    {
+      name = "gulp_match___gulp_match_1.1.0.tgz";
+      path = fetchurl {
+        name = "gulp_match___gulp_match_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.1.0.tgz";
+        sha1 = "552b7080fc006ee752c90563f9fec9d61aafdf4f";
+      };
+    }
+    {
+      name = "gulp_ng_annotate___gulp_ng_annotate_1.1.0.tgz";
+      path = fetchurl {
+        name = "gulp_ng_annotate___gulp_ng_annotate_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-ng-annotate/-/gulp-ng-annotate-1.1.0.tgz";
+        sha1 = "5e801be073d8f6d343c4ff65b71717b90fac13ce";
+      };
+    }
+    {
      name = "gulp_ng_classify___gulp_ng_classify_4.0.1.tgz";
      path = fetchurl {
        name = "gulp_ng_classify___gulp_ng_classify_4.0.1.tgz";
@@ -1956,6 +3459,42 @@
    }
    {
+      name = "gulp_pug___gulp_pug_3.3.0.tgz";
+      path = fetchurl {
+        name = "gulp_pug___gulp_pug_3.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-pug/-/gulp-pug-3.3.0.tgz";
+        sha1 = "46982c1439c094c360542ed8ba5c882d3bb711cf";
+      };
+    }
+    {
+      name = "gulp_remember___gulp_remember_0.3.1.tgz";
+      path = fetchurl {
+        name = "gulp_remember___gulp_remember_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-remember/-/gulp-remember-0.3.1.tgz";
+        sha1 = "5776b6f64c5a1c5c4d4555406723ec8e2b0407e7";
+      };
+    }
+    {
+      name = "gulp_rename___gulp_rename_1.2.3.tgz";
+      path = fetchurl {
+        name = "gulp_rename___gulp_rename_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.3.tgz";
+        sha1 = "37b75298e9d3e6c0fe9ac4eac13ce3be5434646b";
+      };
+    }
+    {
+      name = "gulp_replace___gulp_replace_0.5.4.tgz";
+      path = fetchurl {
+        name = "gulp_replace___gulp_replace_0.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-0.5.4.tgz";
+        sha1 = "69a67914bbd13c562bff14f504a403796aa0daa9";
+      };
+    }
+    {
      name = "gulp_sass___gulp_sass_3.2.1.tgz";
      path = fetchurl {
        name = "gulp_sass___gulp_sass_3.2.1.tgz";
@@ -1965,6 +3504,24 @@
    }
    {
+      name = "gulp_sourcemaps___gulp_sourcemaps_1.6.0.tgz";
+      path = fetchurl {
+        name = "gulp_sourcemaps___gulp_sourcemaps_1.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz";
+        sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
+      };
+    }
+    {
+      name = "gulp_uglify___gulp_uglify_1.4.2.tgz";
+      path = fetchurl {
+        name = "gulp_uglify___gulp_uglify_1.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-1.4.2.tgz";
+        sha1 = "2807ea1016e4962c37766c02feeb5501818857c3";
+      };
+    }
+    {
      name = "gulp_util___gulp_util_3.0.8.tgz";
      path = fetchurl {
        name = "gulp_util___gulp_util_3.0.8.tgz";
@@ -1974,11 +3531,38 @@
    }
    {
-      name = "gulp___gulp_3.9.0.tgz";
+      name = "gulp_util___gulp_util_3.0.7.tgz";
+      path = fetchurl {
+        name = "gulp_util___gulp_util_3.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.7.tgz";
+        sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
+      };
+    }
+    {
+      name = "gulp_util___gulp_util_2.2.20.tgz";
+      path = fetchurl {
+        name = "gulp_util___gulp_util_2.2.20.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz";
+        sha1 = "d7146e5728910bd8f047a6b0b1e549bc22dbd64c";
+      };
+    }
+    {
+      name = "gulp_wrap___gulp_wrap_0.8.0.tgz";
      path = fetchurl {
-        name = "gulp___gulp_3.9.0.tgz";
+        name = "gulp_wrap___gulp_wrap_0.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/gulp/-/gulp-3.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/gulp-wrap/-/gulp-wrap-0.8.0.tgz";
-        sha1 = "cf1fba4cb558bb8c6ae6c9613f583ae2620d214a";
+        sha1 = "c41ce89a374947788b78c9e67f33bbe838c69b86";
+      };
+    }
+    {
+      name = "gulp___gulp_3.9.1.tgz";
+      path = fetchurl {
+        name = "gulp___gulp_3.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz";
+        sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
      };
    }
@@ -1992,11 +3576,20 @@
    }
    {
-      name = "handlebars___handlebars_4.1.0.tgz";
+      name = "handlebars___handlebars_4.7.3.tgz";
      path = fetchurl {
-        name = "handlebars___handlebars_4.1.0.tgz";
+        name = "handlebars___handlebars_4.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz";
-        sha1 = "0d6a6f34ff1f63cecec8423aa4169827bf787c3a";
+        sha1 = "8ece2797826886cf8082d1726ff21d2a022550ee";
+      };
+    }
+    {
+      name = "handlebars___handlebars_1.3.0.tgz";
+      path = fetchurl {
+        name = "handlebars___handlebars_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-1.3.0.tgz";
+        sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
      };
    }
@@ -2046,6 +3639,15 @@
    }
    {
+      name = "has_color___has_color_0.1.7.tgz";
+      path = fetchurl {
+        name = "has_color___has_color_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+      };
+    }
+    {
      name = "has_cors___has_cors_1.1.0.tgz";
      path = fetchurl {
        name = "has_cors___has_cors_1.1.0.tgz";
@@ -2064,6 +3666,15 @@
    }
    {
+      name = "has_flag___has_flag_4.0.0.tgz";
+      path = fetchurl {
+        name = "has_flag___has_flag_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz";
+        sha1 = "944771fd9c81c81265c4d6941860da06bb59479b";
+      };
+    }
+    {
      name = "has_gulplog___has_gulplog_0.1.0.tgz";
      path = fetchurl {
        name = "has_gulplog___has_gulplog_0.1.0.tgz";
@@ -2127,6 +3738,33 @@
    }
    {
+      name = "hawk___hawk_1.1.1.tgz";
+      path = fetchurl {
+        name = "hawk___hawk_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/hawk/-/hawk-1.1.1.tgz";
+        sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+      };
+    }
+    {
+      name = "hawk___hawk_1.0.0.tgz";
+      path = fetchurl {
+        name = "hawk___hawk_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/hawk/-/hawk-1.0.0.tgz";
+        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      };
+    }
+    {
+      name = "hoek___hoek_0.9.1.tgz";
+      path = fetchurl {
+        name = "hoek___hoek_0.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz";
+        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      };
+    }
+    {
      name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz";
      path = fetchurl {
        name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz";
@@ -2136,20 +3774,29 @@
    }
    {
-      name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
+      name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+      path = fetchurl {
+        name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
+        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488";
+      };
+    }
+    {
+      name = "http_browserify___http_browserify_1.3.2.tgz";
      path = fetchurl {
-        name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
+        name = "http_browserify___http_browserify_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/http-browserify/-/http-browserify-1.3.2.tgz";
-        sha1 = "97f236977bd6e125408930ff6de3eec6281ec047";
+        sha1 = "b562c34479349a690d7a6597df495aefa8c604f5";
      };
    }
    {
-      name = "http_errors___http_errors_1.6.3.tgz";
+      name = "http_errors___http_errors_1.7.2.tgz";
      path = fetchurl {
-        name = "http_errors___http_errors_1.6.3.tgz";
+        name = "http_errors___http_errors_1.7.2.tgz";
-        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz";
-        sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
+        sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f";
      };
    }
@@ -2163,20 +3810,29 @@
    }
    {
-      name = "http_parser_js___http_parser_js_0.5.0.tgz";
+      name = "http_parser_js___http_parser_js_0.4.10.tgz";
      path = fetchurl {
-        name = "http_parser_js___http_parser_js_0.5.0.tgz";
+        name = "http_parser_js___http_parser_js_0.4.10.tgz";
-        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz";
-        sha1 = "d65edbede84349d0dc30320815a15d39cc3cbbd8";
+        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
      };
    }
    {
-      name = "http_proxy___http_proxy_1.17.0.tgz";
+      name = "http_proxy___http_proxy_1.18.0.tgz";
      path = fetchurl {
-        name = "http_proxy___http_proxy_1.17.0.tgz";
+        name = "http_proxy___http_proxy_1.18.0.tgz";
-        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz";
-        sha1 = "7ad38494658f84605e2f6db4436df410f4e5be9a";
+        sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a";
+      };
+    }
+    {
+      name = "http_signature___http_signature_0.10.1.tgz";
+      path = fetchurl {
+        name = "http_signature___http_signature_0.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz";
+        sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
      };
    }
@@ -2190,20 +3846,20 @@
    }
    {
-      name = "iconv_lite___iconv_lite_0.4.13.tgz";
+      name = "https_browserify___https_browserify_0.0.1.tgz";
      path = fetchurl {
-        name = "iconv_lite___iconv_lite_0.4.13.tgz";
+        name = "https_browserify___https_browserify_0.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz";
+        url  = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
      };
    }
    {
-      name = "iconv_lite___iconv_lite_0.4.23.tgz";
+      name = "iconv_lite___iconv_lite_0.4.13.tgz";
      path = fetchurl {
-        name = "iconv_lite___iconv_lite_0.4.23.tgz";
+        name = "iconv_lite___iconv_lite_0.4.13.tgz";
-        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "297871f63be507adcfbfca715d0cd0eed84e9a63";
+        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
      };
    }
@@ -2217,20 +3873,29 @@
    }
    {
-      name = "ignore_walk___ignore_walk_3.0.1.tgz";
+      name = "ieee754___ieee754_1.1.13.tgz";
      path = fetchurl {
-        name = "ignore_walk___ignore_walk_3.0.1.tgz";
+        name = "ieee754___ieee754_1.1.13.tgz";
-        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz";
-        sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8";
+        sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84";
      };
    }
    {
-      name = "in_publish___in_publish_2.0.0.tgz";
+      name = "ignore_walk___ignore_walk_3.0.3.tgz";
      path = fetchurl {
-        name = "in_publish___in_publish_2.0.0.tgz";
+        name = "ignore_walk___ignore_walk_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz";
-        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
+        sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37";
+      };
+    }
+    {
+      name = "in_publish___in_publish_2.0.1.tgz";
+      path = fetchurl {
+        name = "in_publish___in_publish_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz";
+        sha1 = "948b1a535c8030561cea522f73f78f4be357e00c";
      };
    }
@@ -2253,6 +3918,15 @@
    }
    {
+      name = "infinity_agent___infinity_agent_2.0.3.tgz";
+      path = fetchurl {
+        name = "infinity_agent___infinity_agent_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/infinity-agent/-/infinity-agent-2.0.3.tgz";
+        sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
+      };
+    }
+    {
      name = "inflight___inflight_1.0.6.tgz";
      path = fetchurl {
        name = "inflight___inflight_1.0.6.tgz";
@@ -2271,6 +3945,24 @@
    }
    {
+      name = "inherits___inherits_2.0.4.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+        sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
+      };
+    }
+    {
+      name = "inherits___inherits_2.0.1.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    }
+    {
      name = "inherits___inherits_2.0.3.tgz";
      path = fetchurl {
        name = "inherits___inherits_2.0.3.tgz";
@@ -2289,11 +3981,65 @@
    }
    {
-      name = "interpret___interpret_0.6.6.tgz";
+      name = "inline_source_map___inline_source_map_0.3.1.tgz";
      path = fetchurl {
-        name = "interpret___interpret_0.6.6.tgz";
+        name = "inline_source_map___inline_source_map_0.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.3.1.tgz";
-        sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
+        sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
+      };
+    }
+    {
+      name = "inquirer___inquirer_0.4.1.tgz";
+      path = fetchurl {
+        name = "inquirer___inquirer_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.4.1.tgz";
+        sha1 = "6cf74eb1a347f97a1a207bea8ad1c987d0ff4b81";
+      };
+    }
+    {
+      name = "inquirer___inquirer_0.5.1.tgz";
+      path = fetchurl {
+        name = "inquirer___inquirer_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.5.1.tgz";
+        sha1 = "e9f2cd1ee172c7a32e054b78a03d4ddb0d7707f1";
+      };
+    }
+    {
+      name = "insert_module_globals___insert_module_globals_6.0.0.tgz";
+      path = fetchurl {
+        name = "insert_module_globals___insert_module_globals_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-6.0.0.tgz";
+        sha1 = "ee8aeb9dee16819e33aa14588a558824af0c15dc";
+      };
+    }
+    {
+      name = "insight___insight_0.3.1.tgz";
+      path = fetchurl {
+        name = "insight___insight_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/insight/-/insight-0.3.1.tgz";
+        sha1 = "1a14f32c06115c0850338c38a253d707b611d448";
+      };
+    }
+    {
+      name = "interpret___interpret_1.2.0.tgz";
+      path = fetchurl {
+        name = "interpret___interpret_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz";
+        sha1 = "d5061a6224be58e8083985f5014d844359576296";
+      };
+    }
+    {
+      name = "intersect___intersect_0.0.3.tgz";
+      path = fetchurl {
+        name = "intersect___intersect_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/intersect/-/intersect-0.0.3.tgz";
+        sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
      };
    }
@@ -2415,6 +4161,15 @@
    }
    {
+      name = "is_expression___is_expression_3.0.0.tgz";
+      path = fetchurl {
+        name = "is_expression___is_expression_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz";
+        sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f";
+      };
+    }
+    {
      name = "is_extendable___is_extendable_0.1.1.tgz";
      path = fetchurl {
        name = "is_extendable___is_extendable_0.1.1.tgz";
@@ -2451,11 +4206,11 @@
    }
    {
-      name = "is_finite___is_finite_1.0.2.tgz";
+      name = "is_finite___is_finite_1.1.0.tgz";
      path = fetchurl {
-        name = "is_finite___is_finite_1.0.2.tgz";
+        name = "is_finite___is_finite_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3";
      };
    }
@@ -2496,6 +4251,15 @@
    }
    {
+      name = "is_npm___is_npm_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_npm___is_npm_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+      };
+    }
+    {
      name = "is_number___is_number_0.1.1.tgz";
      path = fetchurl {
        name = "is_number___is_number_0.1.1.tgz";
@@ -2559,6 +4323,33 @@
    }
    {
+      name = "is_promise___is_promise_2.1.0.tgz";
+      path = fetchurl {
+        name = "is_promise___is_promise_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    }
+    {
+      name = "is_redirect___is_redirect_1.0.0.tgz";
+      path = fetchurl {
+        name = "is_redirect___is_redirect_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+      };
+    }
+    {
+      name = "is_regex___is_regex_1.0.5.tgz";
+      path = fetchurl {
+        name = "is_regex___is_regex_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
+        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
+      };
+    }
+    {
      name = "is_relative___is_relative_1.0.0.tgz";
      path = fetchurl {
        name = "is_relative___is_relative_1.0.0.tgz";
@@ -2568,6 +4359,24 @@
    }
    {
+      name = "is_root___is_root_0.1.0.tgz";
+      path = fetchurl {
+        name = "is_root___is_root_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-root/-/is-root-0.1.0.tgz";
+        sha1 = "825e394ab593df2d73c5d0092fce507270b53dcb";
+      };
+    }
+    {
+      name = "is_stream___is_stream_1.1.0.tgz";
+      path = fetchurl {
+        name = "is_stream___is_stream_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    }
+    {
      name = "is_typedarray___is_typedarray_1.0.0.tgz";
      path = fetchurl {
        name = "is_typedarray___is_typedarray_1.0.0.tgz";
@@ -2685,6 +4494,15 @@
    }
    {
+      name = "istextorbinary___istextorbinary_1.0.2.tgz";
+      path = fetchurl {
+        name = "istextorbinary___istextorbinary_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-1.0.2.tgz";
+        sha1 = "ace19354d1a9a0173efeb1084ce0f87b0ad7decf";
+      };
+    }
+    {
      name = "jasmine_core___jasmine_core_2.99.1.tgz";
      path = fetchurl {
        name = "jasmine_core___jasmine_core_2.99.1.tgz";
@@ -2694,20 +4512,47 @@
    }
    {
-      name = "js_base64___js_base64_2.5.1.tgz";
+      name = "js_base64___js_base64_2.5.2.tgz";
+      path = fetchurl {
+        name = "js_base64___js_base64_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz";
+        sha1 = "313b6274dda718f714d00b3330bbae6e38e90209";
+      };
+    }
+    {
+      name = "js_string_escape___js_string_escape_1.0.1.tgz";
+      path = fetchurl {
+        name = "js_string_escape___js_string_escape_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz";
+        sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef";
+      };
+    }
+    {
+      name = "js_stringify___js_stringify_1.0.2.tgz";
      path = fetchurl {
-        name = "js_base64___js_base64_2.5.1.tgz";
+        name = "js_stringify___js_stringify_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz";
-        sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121";
+        sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db";
      };
    }
    {
-      name = "js_yaml___js_yaml_3.12.2.tgz";
+      name = "js_yaml___js_yaml_3.13.1.tgz";
      path = fetchurl {
-        name = "js_yaml___js_yaml_3.12.2.tgz";
+        name = "js_yaml___js_yaml_3.13.1.tgz";
-        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz";
+        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz";
-        sha1 = "ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc";
+        sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
+      };
+    }
+    {
+      name = "js_yaml___js_yaml_3.0.2.tgz";
+      path = fetchurl {
+        name = "js_yaml___js_yaml_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.0.2.tgz";
+        sha1 = "9937865f8e897a5e894e73c2c5cf2e89b32eb771";
      };
    }
@@ -2757,6 +4602,24 @@
    }
    {
+      name = "jsonify___jsonify_0.0.0.tgz";
+      path = fetchurl {
+        name = "jsonify___jsonify_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    }
+    {
+      name = "jsonparse___jsonparse_0.0.5.tgz";
+      path = fetchurl {
+        name = "jsonparse___jsonparse_0.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz";
+        sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64";
+      };
+    }
+    {
      name = "jsprim___jsprim_1.4.1.tgz";
      path = fetchurl {
        name = "jsprim___jsprim_1.4.1.tgz";
@@ -2766,6 +4629,24 @@
    }
    {
+      name = "jstransformer___jstransformer_1.0.0.tgz";
+      path = fetchurl {
+        name = "jstransformer___jstransformer_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz";
+        sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
+      };
+    }
+    {
+      name = "junk___junk_0.3.0.tgz";
+      path = fetchurl {
+        name = "junk___junk_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/junk/-/junk-0.3.0.tgz";
+        sha1 = "6c89c636f6e99898d8efbfc50430db40be71e10c";
+      };
+    }
+    {
      name = "karma_chrome_launcher___karma_chrome_launcher_2.1.1.tgz";
      path = fetchurl {
        name = "karma_chrome_launcher___karma_chrome_launcher_2.1.1.tgz";
@@ -2847,11 +4728,38 @@
    }
    {
-      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.3.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+        sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
+      };
+    }
+    {
+      name = "latest_version___latest_version_1.0.1.tgz";
+      path = fetchurl {
+        name = "latest_version___latest_version_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/latest-version/-/latest-version-1.0.1.tgz";
+        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
+      };
+    }
+    {
+      name = "lazy_cache___lazy_cache_1.0.4.tgz";
+      path = fetchurl {
+        name = "lazy_cache___lazy_cache_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    }
+    {
+      name = "lazypipe___lazypipe_1.0.2.tgz";
      path = fetchurl {
-        name = "kind_of___kind_of_6.0.2.tgz";
+        name = "lazypipe___lazypipe_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/lazypipe/-/lazypipe-1.0.2.tgz";
-        sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051";
+        sha1 = "b66f64ed7fd8b04869f1f1bcb795dbbaa80e418c";
      };
    }
@@ -2865,6 +4773,15 @@
    }
    {
+      name = "less___less_1.7.5.tgz";
+      path = fetchurl {
+        name = "less___less_1.7.5.tgz";
+        url  = "https://registry.yarnpkg.com/less/-/less-1.7.5.tgz";
+        sha1 = "4f220cf7288a27eaca739df6e4808a2d4c0d5756";
+      };
+    }
+    {
      name = "levn___levn_0.3.0.tgz";
      path = fetchurl {
        name = "levn___levn_0.3.0.tgz";
@@ -2874,6 +4791,15 @@
    }
    {
+      name = "lexical_scope___lexical_scope_1.1.1.tgz";
+      path = fetchurl {
+        name = "lexical_scope___lexical_scope_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.1.1.tgz";
+        sha1 = "debac1067435f1359d90fcfd9e94bcb2ee47b2bf";
+      };
+    }
+    {
      name = "liftoff___liftoff_2.5.0.tgz";
      path = fetchurl {
        name = "liftoff___liftoff_2.5.0.tgz";
@@ -2901,6 +4827,15 @@
    }
    {
+      name = "lockfile___lockfile_0.4.3.tgz";
+      path = fetchurl {
+        name = "lockfile___lockfile_0.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/lockfile/-/lockfile-0.4.3.tgz";
+        sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224";
+      };
+    }
+    {
      name = "lodash._baseassign___lodash._baseassign_3.2.0.tgz";
      path = fetchurl {
        name = "lodash._baseassign___lodash._baseassign_3.2.0.tgz";
@@ -2955,6 +4890,24 @@
    }
    {
+      name = "lodash._escapehtmlchar___lodash._escapehtmlchar_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._escapehtmlchar___lodash._escapehtmlchar_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz";
+        sha1 = "df67c3bb6b7e8e1e831ab48bfa0795b92afe899d";
+      };
+    }
+    {
+      name = "lodash._escapestringchar___lodash._escapestringchar_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._escapestringchar___lodash._escapestringchar_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz";
+        sha1 = "ecfe22618a2ade50bfeea43937e51df66f0edb72";
+      };
+    }
+    {
      name = "lodash._getnative___lodash._getnative_3.9.1.tgz";
      path = fetchurl {
        name = "lodash._getnative___lodash._getnative_3.9.1.tgz";
@@ -2964,6 +4917,15 @@
    }
    {
+      name = "lodash._htmlescapes___lodash._htmlescapes_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._htmlescapes___lodash._htmlescapes_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz";
+        sha1 = "32d14bf0844b6de6f8b62a051b4f67c228b624cb";
+      };
+    }
+    {
      name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz";
      path = fetchurl {
        name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz";
@@ -2973,6 +4935,24 @@
    }
    {
+      name = "lodash._isnative___lodash._isnative_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._isnative___lodash._isnative_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
+      };
+    }
+    {
+      name = "lodash._objecttypes___lodash._objecttypes_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._objecttypes___lodash._objecttypes_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      };
+    }
+    {
      name = "lodash._reescape___lodash._reescape_3.0.0.tgz";
      path = fetchurl {
        name = "lodash._reescape___lodash._reescape_3.0.0.tgz";
@@ -2991,6 +4971,15 @@
    }
    {
+      name = "lodash._reinterpolate___lodash._reinterpolate_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._reinterpolate___lodash._reinterpolate_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz";
+        sha1 = "4f1227aa5a8711fc632f5b07a1f4607aab8b3222";
+      };
+    }
+    {
      name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz";
      path = fetchurl {
        name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz";
@@ -3000,6 +4989,15 @@
    }
    {
+      name = "lodash._reunescapedhtml___lodash._reunescapedhtml_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash._reunescapedhtml___lodash._reunescapedhtml_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz";
+        sha1 = "747c4fc40103eb3bb8a0976e571f7a2659e93ba7";
+      };
+    }
+    {
      name = "lodash._root___lodash._root_3.0.1.tgz";
      path = fetchurl {
        name = "lodash._root___lodash._root_3.0.1.tgz";
@@ -3009,11 +5007,11 @@
    }
    {
-      name = "lodash.assign___lodash.assign_3.2.0.tgz";
+      name = "lodash._shimkeys___lodash._shimkeys_2.4.1.tgz";
      path = fetchurl {
-        name = "lodash.assign___lodash.assign_3.2.0.tgz";
+        name = "lodash._shimkeys___lodash._shimkeys_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
-        sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
+        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
      };
    }
@@ -3027,6 +5025,15 @@
    }
    {
+      name = "lodash.assign___lodash.assign_3.2.0.tgz";
+      path = fetchurl {
+        name = "lodash.assign___lodash.assign_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz";
+        sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
+      };
+    }
+    {
      name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
      path = fetchurl {
        name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz";
@@ -3036,6 +5043,33 @@
    }
    {
+      name = "lodash.debounce___lodash.debounce_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.debounce___lodash.debounce_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
+        sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
+      };
+    }
+    {
+      name = "lodash.defaults___lodash.defaults_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.defaults___lodash.defaults_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz";
+        sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54";
+      };
+    }
+    {
+      name = "lodash.defaults___lodash.defaults_4.2.0.tgz";
+      path = fetchurl {
+        name = "lodash.defaults___lodash.defaults_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+      };
+    }
+    {
      name = "lodash.escape___lodash.escape_3.2.0.tgz";
      path = fetchurl {
        name = "lodash.escape___lodash.escape_3.2.0.tgz";
@@ -3045,6 +5079,15 @@
    }
    {
+      name = "lodash.escape___lodash.escape_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.escape___lodash.escape_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz";
+        sha1 = "2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4";
+      };
+    }
+    {
      name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz";
      path = fetchurl {
        name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz";
@@ -3063,6 +5106,24 @@
    }
    {
+      name = "lodash.isfunction___lodash.isfunction_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.isfunction___lodash.isfunction_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      };
+    }
+    {
+      name = "lodash.isobject___lodash.isobject_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.isobject___lodash.isobject_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      };
+    }
+    {
      name = "lodash.keys___lodash.keys_3.1.2.tgz";
      path = fetchurl {
        name = "lodash.keys___lodash.keys_3.1.2.tgz";
@@ -3072,11 +5133,20 @@
    }
    {
-      name = "lodash.mergewith___lodash.mergewith_4.6.1.tgz";
+      name = "lodash.keys___lodash.keys_2.4.1.tgz";
      path = fetchurl {
-        name = "lodash.mergewith___lodash.mergewith_4.6.1.tgz";
+        name = "lodash.keys___lodash.keys_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz";
-        sha1 = "639057e726c3afbdb3e7d42741caa8d6e4335927";
+        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+      };
+    }
+    {
+      name = "lodash.now___lodash.now_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.now___lodash.now_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.now/-/lodash.now-2.4.1.tgz";
+        sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
      };
    }
@@ -3090,6 +5160,15 @@
    }
    {
+      name = "lodash.template___lodash.template_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.template___lodash.template_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz";
+        sha1 = "9e611007edf629129a974ab3c48b817b3e1cf20d";
+      };
+    }
+    {
      name = "lodash.template___lodash.template_3.6.2.tgz";
      path = fetchurl {
        name = "lodash.template___lodash.template_3.6.2.tgz";
@@ -3099,6 +5178,15 @@
    }
    {
+      name = "lodash.template___lodash.template_4.5.0.tgz";
+      path = fetchurl {
+        name = "lodash.template___lodash.template_4.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz";
+        sha1 = "f976195cf3f347d0d5f52483569fe8031ccce8ab";
+      };
+    }
+    {
      name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz";
      path = fetchurl {
        name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz";
@@ -3108,6 +5196,42 @@
    }
    {
+      name = "lodash.templatesettings___lodash.templatesettings_4.2.0.tgz";
+      path = fetchurl {
+        name = "lodash.templatesettings___lodash.templatesettings_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz";
+        sha1 = "e481310f049d3cf6d47e912ad09313b154f0fb33";
+      };
+    }
+    {
+      name = "lodash.templatesettings___lodash.templatesettings_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.templatesettings___lodash.templatesettings_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz";
+        sha1 = "ea76c75d11eb86d4dbe89a83893bb861929ac699";
+      };
+    }
+    {
+      name = "lodash.values___lodash.values_2.4.1.tgz";
+      path = fetchurl {
+        name = "lodash.values___lodash.values_2.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz";
+        sha1 = "abf514436b3cb705001627978cbcf30b1280eea4";
+      };
+    }
+    {
+      name = "lodash___lodash_2.4.2.tgz";
+      path = fetchurl {
+        name = "lodash___lodash_2.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz";
+        sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+      };
+    }
+    {
      name = "lodash___lodash_3.10.1.tgz";
      path = fetchurl {
        name = "lodash___lodash_3.10.1.tgz";
@@ -3117,11 +5241,11 @@
    }
    {
-      name = "lodash___lodash_4.17.11.tgz";
+      name = "lodash___lodash_4.17.15.tgz";
      path = fetchurl {
-        name = "lodash___lodash_4.17.11.tgz";
+        name = "lodash___lodash_4.17.15.tgz";
-        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
-        sha1 = "b39ea6229ef607ecd89e2c8df12536891cac9b8d";
+        sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
      };
    }
@@ -3144,6 +5268,15 @@
    }
    {
+      name = "longest___longest_1.0.1.tgz";
+      path = fetchurl {
+        name = "longest___longest_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    }
+    {
      name = "loophole___loophole_1.1.0.tgz";
      path = fetchurl {
        name = "loophole___loophole_1.1.0.tgz";
@@ -3162,6 +5295,15 @@
    }
    {
+      name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
+      path = fetchurl {
+        name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f";
+      };
+    }
+    {
      name = "lru_cache___lru_cache_2.7.3.tgz";
      path = fetchurl {
        name = "lru_cache___lru_cache_2.7.3.tgz";
@@ -3180,6 +5322,33 @@
    }
    {
+      name = "lru_cache___lru_cache_2.3.1.tgz";
+      path = fetchurl {
+        name = "lru_cache___lru_cache_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.3.1.tgz";
+        sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
+      };
+    }
+    {
+      name = "lru_cache___lru_cache_2.5.2.tgz";
+      path = fetchurl {
+        name = "lru_cache___lru_cache_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.5.2.tgz";
+        sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
+      };
+    }
+    {
+      name = "lru_queue___lru_queue_0.1.0.tgz";
+      path = fetchurl {
+        name = "lru_queue___lru_queue_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz";
+        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+      };
+    }
+    {
      name = "make_iterator___make_iterator_1.0.1.tgz";
      path = fetchurl {
        name = "make_iterator___make_iterator_1.0.1.tgz";
@@ -3216,6 +5385,15 @@
    }
    {
+      name = "map_stream___map_stream_0.1.0.tgz";
+      path = fetchurl {
+        name = "map_stream___map_stream_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz";
+        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+      };
+    }
+    {
      name = "map_visit___map_visit_1.0.0.tgz";
      path = fetchurl {
        name = "map_visit___map_visit_1.0.0.tgz";
@@ -3243,6 +5421,24 @@
    }
    {
+      name = "memoizee___memoizee_0.2.6.tgz";
+      path = fetchurl {
+        name = "memoizee___memoizee_0.2.6.tgz";
+        url  = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.2.6.tgz";
+        sha1 = "bb45a7ad02530082f1612671dab35219cd2e0741";
+      };
+    }
+    {
+      name = "memoizee___memoizee_0.3.10.tgz";
+      path = fetchurl {
+        name = "memoizee___memoizee_0.3.10.tgz";
+        url  = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.3.10.tgz";
+        sha1 = "4eca0d8aed39ec9d017f4c5c2f2f6432f42e5c8f";
+      };
+    }
+    {
      name = "meow___meow_3.7.0.tgz";
      path = fetchurl {
        name = "meow___meow_3.7.0.tgz";
@@ -3252,6 +5448,24 @@
    }
    {
+      name = "merge_stream___merge_stream_1.0.1.tgz";
+      path = fetchurl {
+        name = "merge_stream___merge_stream_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+      };
+    }
+    {
+      name = "merge___merge_1.2.1.tgz";
+      path = fetchurl {
+        name = "merge___merge_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz";
+        sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145";
+      };
+    }
+    {
      name = "micromatch___micromatch_2.3.11.tgz";
      path = fetchurl {
        name = "micromatch___micromatch_2.3.11.tgz";
@@ -3270,20 +5484,56 @@
    }
    {
-      name = "mime_db___mime_db_1.38.0.tgz";
+      name = "mime_db___mime_db_1.43.0.tgz";
      path = fetchurl {
-        name = "mime_db___mime_db_1.38.0.tgz";
+        name = "mime_db___mime_db_1.43.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz";
-        sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad";
+        sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58";
      };
    }
    {
-      name = "mime_types___mime_types_2.1.22.tgz";
+      name = "mime_db___mime_db_1.12.0.tgz";
      path = fetchurl {
-        name = "mime_types___mime_types_2.1.22.tgz";
+        name = "mime_db___mime_db_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.12.0.tgz";
-        sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd";
+        sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.1.26.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.1.26.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
+        sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
+      };
+    }
+    {
+      name = "mime_types___mime_types_1.0.2.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz";
+        sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+      };
+    }
+    {
+      name = "mime_types___mime_types_2.0.14.tgz";
+      path = fetchurl {
+        name = "mime_types___mime_types_2.0.14.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.0.14.tgz";
+        sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+      };
+    }
+    {
+      name = "mime___mime_1.3.4.tgz";
+      path = fetchurl {
+        name = "mime___mime_1.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
      };
    }
@@ -3297,6 +5547,15 @@
    }
    {
+      name = "mime___mime_1.2.11.tgz";
+      path = fetchurl {
+        name = "mime___mime_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz";
+        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      };
+    }
+    {
      name = "mini_lr___mini_lr_0.1.9.tgz";
      path = fetchurl {
        name = "mini_lr___mini_lr_0.1.9.tgz";
@@ -3306,20 +5565,20 @@
    }
    {
-      name = "minimatch___minimatch_3.0.4.tgz";
+      name = "minimatch___minimatch_0.3.0.tgz";
      path = fetchurl {
-        name = "minimatch___minimatch_3.0.4.tgz";
+        name = "minimatch___minimatch_0.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz";
-        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
      };
    }
    {
-      name = "minimatch___minimatch_2.0.10.tgz";
+      name = "minimatch___minimatch_3.0.4.tgz";
      path = fetchurl {
-        name = "minimatch___minimatch_2.0.10.tgz";
+        name = "minimatch___minimatch_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
-        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
      };
    }
@@ -3333,20 +5592,38 @@
    }
    {
-      name = "minimist___minimist_0.0.8.tgz";
+      name = "minimatch___minimatch_1.0.0.tgz";
      path = fetchurl {
-        name = "minimist___minimist_0.0.8.tgz";
+        name = "minimatch___minimatch_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
      };
    }
    {
-      name = "minimist___minimist_1.2.0.tgz";
+      name = "minimatch___minimatch_2.0.10.tgz";
      path = fetchurl {
-        name = "minimist___minimist_1.2.0.tgz";
+        name = "minimatch___minimatch_2.0.10.tgz";
-        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+      };
+    }
+    {
+      name = "minimist___minimist_0.2.1.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz";
+        sha1 = "827ba4e7593464e7c221e8c5bed930904ee2c455";
+      };
+    }
+    {
+      name = "minimist___minimist_1.2.5.tgz";
+      path = fetchurl {
+        name = "minimist___minimist_1.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
+        sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
      };
    }
@@ -3360,38 +5637,74 @@
    }
    {
-      name = "minipass___minipass_2.3.5.tgz";
+      name = "minipass___minipass_2.9.0.tgz";
      path = fetchurl {
-        name = "minipass___minipass_2.3.5.tgz";
+        name = "minipass___minipass_2.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz";
-        sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848";
+        sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6";
      };
    }
    {
-      name = "minizlib___minizlib_1.2.1.tgz";
+      name = "minizlib___minizlib_1.3.3.tgz";
      path = fetchurl {
-        name = "minizlib___minizlib_1.2.1.tgz";
+        name = "minizlib___minizlib_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz";
-        sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614";
+        sha1 = "2290de96818a34c29551c8a8d301216bd65a861d";
      };
    }
    {
-      name = "mixin_deep___mixin_deep_1.3.1.tgz";
+      name = "mixin_deep___mixin_deep_1.3.2.tgz";
      path = fetchurl {
-        name = "mixin_deep___mixin_deep_1.3.1.tgz";
+        name = "mixin_deep___mixin_deep_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz";
-        sha1 = "a49e7268dce1a0d9698e45326c5626df3543d0fe";
+        sha1 = "1120b43dc359a785dce65b55b82e257ccf479566";
      };
    }
    {
-      name = "mkdirp___mkdirp_0.5.1.tgz";
+      name = "mkdirp___mkdirp_0.5.4.tgz";
      path = fetchurl {
-        name = "mkdirp___mkdirp_0.5.1.tgz";
+        name = "mkdirp___mkdirp_0.5.4.tgz";
-        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        sha1 = "fd01504a6797ec5c9be81ff43d204961ed64a512";
+      };
+    }
+    {
+      name = "mkdirp___mkdirp_0.3.5.tgz";
+      path = fetchurl {
+        name = "mkdirp___mkdirp_0.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz";
+        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      };
+    }
+    {
+      name = "mkpath___mkpath_0.1.0.tgz";
+      path = fetchurl {
+        name = "mkpath___mkpath_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mkpath/-/mkpath-0.1.0.tgz";
+        sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
+      };
+    }
+    {
+      name = "module_deps___module_deps_2.0.6.tgz";
+      path = fetchurl {
+        name = "module_deps___module_deps_2.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/module-deps/-/module-deps-2.0.6.tgz";
+        sha1 = "b999321c73ac33580f00712c0f3075fdca42563f";
+      };
+    }
+    {
+      name = "mout___mout_0.9.1.tgz";
+      path = fetchurl {
+        name = "mout___mout_0.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/mout/-/mout-0.9.1.tgz";
+        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
      };
    }
@@ -3423,11 +5736,11 @@
    }
    {
-      name = "ms___ms_2.1.1.tgz";
+      name = "ms___ms_2.1.2.tgz";
      path = fetchurl {
-        name = "ms___ms_2.1.1.tgz";
+        name = "ms___ms_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz";
-        sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a";
+        sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009";
      };
    }
@@ -3441,11 +5754,29 @@
    }
    {
-      name = "nan___nan_2.12.1.tgz";
+      name = "mute_stream___mute_stream_0.0.4.tgz";
      path = fetchurl {
-        name = "nan___nan_2.12.1.tgz";
+        name = "mute_stream___mute_stream_0.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz";
-        sha1 = "7b1aa193e9aa86057e3c7bbd0ac448e770925552";
+        sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+      };
+    }
+    {
+      name = "mute_stream___mute_stream_0.0.8.tgz";
+      path = fetchurl {
+        name = "mute_stream___mute_stream_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz";
+        sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d";
+      };
+    }
+    {
+      name = "nan___nan_2.14.0.tgz";
+      path = fetchurl {
+        name = "nan___nan_2.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz";
+        sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c";
      };
    }
@@ -3468,11 +5799,11 @@
    }
    {
-      name = "needle___needle_2.2.4.tgz";
+      name = "needle___needle_2.3.3.tgz";
      path = fetchurl {
-        name = "needle___needle_2.2.4.tgz";
+        name = "needle___needle_2.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz";
-        sha1 = "51931bff82533b1928b7d1d69e01f1b00ffd2a4e";
+        sha1 = "a041ad1d04a871b0ebb666f40baaf1fb47867117";
      };
    }
@@ -3486,6 +5817,69 @@
    }
    {
+      name = "neo_async___neo_async_2.6.1.tgz";
+      path = fetchurl {
+        name = "neo_async___neo_async_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz";
+        sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
+      };
+    }
+    {
+      name = "nested_error_stacks___nested_error_stacks_1.0.2.tgz";
+      path = fetchurl {
+        name = "nested_error_stacks___nested_error_stacks_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
+        sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
+      };
+    }
+    {
+      name = "next_tick___next_tick_0.1.0.tgz";
+      path = fetchurl {
+        name = "next_tick___next_tick_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/next-tick/-/next-tick-0.1.0.tgz";
+        sha1 = "1912cce8eb9b697d640fbba94f8f00dec3b94259";
+      };
+    }
+    {
+      name = "next_tick___next_tick_1.1.0.tgz";
+      path = fetchurl {
+        name = "next_tick___next_tick_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz";
+        sha1 = "1836ee30ad56d67ef281b22bd199f709449b35eb";
+      };
+    }
+    {
+      name = "next_tick___next_tick_0.2.2.tgz";
+      path = fetchurl {
+        name = "next_tick___next_tick_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz";
+        sha1 = "75da4a927ee5887e39065880065b7336413b310d";
+      };
+    }
+    {
+      name = "next_tick___next_tick_1.0.0.tgz";
+      path = fetchurl {
+        name = "next_tick___next_tick_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz";
+        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
+      };
+    }
+    {
+      name = "ng_annotate___ng_annotate_1.2.2.tgz";
+      path = fetchurl {
+        name = "ng_annotate___ng_annotate_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/ng-annotate/-/ng-annotate-1.2.2.tgz";
+        sha1 = "dc3fc51ba0b2f8b385dbe047f4da06f580a1fd61";
+      };
+    }
+    {
      name = "ng_classify___ng_classify_4.1.1.tgz";
      path = fetchurl {
        name = "ng_classify___ng_classify_4.1.1.tgz";
@@ -3504,20 +5898,29 @@
    }
    {
-      name = "node_pre_gyp___node_pre_gyp_0.10.3.tgz";
+      name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
+      path = fetchurl {
+        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_sass___node_sass_4.13.1.tgz";
      path = fetchurl {
-        name = "node_pre_gyp___node_pre_gyp_0.10.3.tgz";
+        name = "node_sass___node_sass_4.13.1.tgz";
-        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz";
-        sha1 = "3070040716afdc778747b61b6887bf78880b80fc";
+        sha1 = "9db5689696bb2eec2c32b98bfea4c7a2e992d0a3";
      };
    }
    {
-      name = "node_sass___node_sass_4.11.0.tgz";
+      name = "node_uuid___node_uuid_1.4.8.tgz";
      path = fetchurl {
-        name = "node_sass___node_sass_4.11.0.tgz";
+        name = "node_uuid___node_uuid_1.4.8.tgz";
-        url  = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz";
-        sha1 = "183faec398e9cbe93ba43362e2768ca988a6369a";
+        sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
      };
    }
@@ -3540,11 +5943,29 @@
    }
    {
-      name = "nopt___nopt_4.0.1.tgz";
+      name = "nopt___nopt_4.0.3.tgz";
      path = fetchurl {
-        name = "nopt___nopt_4.0.1.tgz";
+        name = "nopt___nopt_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+        sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48";
+      };
+    }
+    {
+      name = "nopt___nopt_1.0.10.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      };
+    }
+    {
+      name = "nopt___nopt_2.2.1.tgz";
+      path = fetchurl {
+        name = "nopt___nopt_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/nopt/-/nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
      };
    }
@@ -3567,20 +5988,29 @@
    }
    {
-      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";
+        name = "npm_bundled___npm_bundled_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz";
-        sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd";
+        sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b";
      };
    }
    {
-      name = "npm_packlist___npm_packlist_1.4.1.tgz";
+      name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
      path = fetchurl {
-        name = "npm_packlist___npm_packlist_1.4.1.tgz";
+        name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
-        sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc";
+        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";
      };
    }
@@ -3612,6 +6042,24 @@
    }
    {
+      name = "oauth_sign___oauth_sign_0.3.0.tgz";
+      path = fetchurl {
+        name = "oauth_sign___oauth_sign_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz";
+        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      };
+    }
+    {
+      name = "oauth_sign___oauth_sign_0.5.0.tgz";
+      path = fetchurl {
+        name = "oauth_sign___oauth_sign_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.5.0.tgz";
+        sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
+      };
+    }
+    {
      name = "oauth_sign___oauth_sign_0.9.0.tgz";
      path = fetchurl {
        name = "oauth_sign___oauth_sign_0.9.0.tgz";
@@ -3621,6 +6069,15 @@
    }
    {
+      name = "object_assign___object_assign_4.1.1.tgz";
+      path = fetchurl {
+        name = "object_assign___object_assign_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    }
+    {
      name = "object_assign___object_assign_4.1.0.tgz";
      path = fetchurl {
        name = "object_assign___object_assign_4.1.0.tgz";
@@ -3630,6 +6087,15 @@
    }
    {
+      name = "object_assign___object_assign_2.1.1.tgz";
+      path = fetchurl {
+        name = "object_assign___object_assign_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz";
+        sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa";
+      };
+    }
+    {
      name = "object_assign___object_assign_3.0.0.tgz";
      path = fetchurl {
        name = "object_assign___object_assign_3.0.0.tgz";
@@ -3639,11 +6105,11 @@
    }
    {
-      name = "object_assign___object_assign_4.1.1.tgz";
+      name = "object_assign___object_assign_0.1.2.tgz";
      path = fetchurl {
-        name = "object_assign___object_assign_4.1.1.tgz";
+        name = "object_assign___object_assign_0.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-0.1.2.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+        sha1 = "036992f073aff7b2db83d06b3fb3155a5ccac37f";
      };
    }
@@ -3666,6 +6132,15 @@
    }
    {
+      name = "object_keys___object_keys_0.4.0.tgz";
+      path = fetchurl {
+        name = "object_keys___object_keys_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz";
+        sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336";
+      };
+    }
+    {
      name = "object_visit___object_visit_1.0.1.tgz";
      path = fetchurl {
        name = "object_visit___object_visit_1.0.1.tgz";
@@ -3738,6 +6213,15 @@
    }
    {
+      name = "opn___opn_0.1.2.tgz";
+      path = fetchurl {
+        name = "opn___opn_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/opn/-/opn-0.1.2.tgz";
+        sha1 = "c527832cfd964d52096b524d0035ecaece51db4f";
+      };
+    }
+    {
      name = "optimist___optimist_0.6.1.tgz";
      path = fetchurl {
        name = "optimist___optimist_0.6.1.tgz";
@@ -3747,11 +6231,20 @@
    }
    {
-      name = "optionator___optionator_0.8.2.tgz";
+      name = "optimist___optimist_0.3.7.tgz";
      path = fetchurl {
-        name = "optionator___optionator_0.8.2.tgz";
+        name = "optimist___optimist_0.3.7.tgz";
-        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      };
+    }
+    {
+      name = "optionator___optionator_0.8.3.tgz";
+      path = fetchurl {
+        name = "optionator___optionator_0.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz";
+        sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
      };
    }
@@ -3774,6 +6267,24 @@
    }
    {
+      name = "ordered_ast_traverse___ordered_ast_traverse_1.1.1.tgz";
+      path = fetchurl {
+        name = "ordered_ast_traverse___ordered_ast_traverse_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz";
+        sha1 = "6843a170bc0eee8b520cc8ddc1ddd3aa30fa057c";
+      };
+    }
+    {
+      name = "ordered_esprima_props___ordered_esprima_props_1.1.0.tgz";
+      path = fetchurl {
+        name = "ordered_esprima_props___ordered_esprima_props_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz";
+        sha1 = "a9827086df5f010aa60e9bd02b6e0335cea2ffcb";
+      };
+    }
+    {
      name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz";
      path = fetchurl {
        name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz";
@@ -3783,6 +6294,15 @@
    }
    {
+      name = "os_browserify___os_browserify_0.1.2.tgz";
+      path = fetchurl {
+        name = "os_browserify___os_browserify_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz";
+        sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
+      };
+    }
+    {
      name = "os_homedir___os_homedir_1.0.2.tgz";
      path = fetchurl {
        name = "os_homedir___os_homedir_1.0.2.tgz";
@@ -3819,6 +6339,60 @@
    }
    {
+      name = "osenv___osenv_0.0.3.tgz";
+      path = fetchurl {
+        name = "osenv___osenv_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/osenv/-/osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      };
+    }
+    {
+      name = "p_throttler___p_throttler_0.0.1.tgz";
+      path = fetchurl {
+        name = "p_throttler___p_throttler_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/p-throttler/-/p-throttler-0.0.1.tgz";
+        sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b";
+      };
+    }
+    {
+      name = "package_json___package_json_1.2.0.tgz";
+      path = fetchurl {
+        name = "package_json___package_json_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/package-json/-/package-json-1.2.0.tgz";
+        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
+      };
+    }
+    {
+      name = "pako___pako_0.2.9.tgz";
+      path = fetchurl {
+        name = "pako___pako_0.2.9.tgz";
+        url  = "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz";
+        sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
+      };
+    }
+    {
+      name = "parents___parents_0.0.2.tgz";
+      path = fetchurl {
+        name = "parents___parents_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/parents/-/parents-0.0.2.tgz";
+        sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
+      };
+    }
+    {
+      name = "parents___parents_0.0.3.tgz";
+      path = fetchurl {
+        name = "parents___parents_0.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/parents/-/parents-0.0.3.tgz";
+        sha1 = "fa212f024d9fa6318dbb6b4ce676c8be493b9c43";
+      };
+    }
+    {
      name = "parse_filepath___parse_filepath_1.0.2.tgz";
      path = fetchurl {
        name = "parse_filepath___parse_filepath_1.0.2.tgz";
@@ -3891,11 +6465,11 @@
    }
    {
-      name = "parseurl___parseurl_1.3.2.tgz";
+      name = "parseurl___parseurl_1.3.3.tgz";
      path = fetchurl {
-        name = "parseurl___parseurl_1.3.2.tgz";
+        name = "parseurl___parseurl_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz";
-        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+        sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4";
      };
    }
@@ -3909,6 +6483,15 @@
    }
    {
+      name = "path_browserify___path_browserify_0.0.1.tgz";
+      path = fetchurl {
+        name = "path_browserify___path_browserify_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a";
+      };
+    }
+    {
      name = "path_exists___path_exists_2.1.0.tgz";
      path = fetchurl {
        name = "path_exists___path_exists_2.1.0.tgz";
@@ -3936,6 +6519,15 @@
    }
    {
+      name = "path_platform___path_platform_0.0.1.tgz";
+      path = fetchurl {
+        name = "path_platform___path_platform_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.0.1.tgz";
+        sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
+      };
+    }
+    {
      name = "path_root_regex___path_root_regex_0.1.2.tgz";
      path = fetchurl {
        name = "path_root_regex___path_root_regex_0.1.2.tgz";
@@ -4026,6 +6618,15 @@
    }
    {
+      name = "prepend_http___prepend_http_1.0.4.tgz";
+      path = fetchurl {
+        name = "prepend_http___prepend_http_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    }
+    {
      name = "preserve___preserve_0.2.0.tgz";
      path = fetchurl {
        name = "preserve___preserve_0.2.0.tgz";
@@ -4044,11 +6645,56 @@
    }
    {
-      name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
+      name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+      path = fetchurl {
+        name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+      };
+    }
+    {
+      name = "process___process_0.7.0.tgz";
      path = fetchurl {
-        name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
+        name = "process___process_0.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/process/-/process-0.7.0.tgz";
-        sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa";
+        sha1 = "c52208161a34adf3812344ae85d3e6150469389d";
+      };
+    }
+    {
+      name = "process___process_0.5.2.tgz";
+      path = fetchurl {
+        name = "process___process_0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz";
+        sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
+      };
+    }
+    {
+      name = "process___process_0.6.0.tgz";
+      path = fetchurl {
+        name = "process___process_0.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/process/-/process-0.6.0.tgz";
+        sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f";
+      };
+    }
+    {
+      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 = "promptly___promptly_0.2.1.tgz";
+      path = fetchurl {
+        name = "promptly___promptly_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/promptly/-/promptly-0.2.1.tgz";
+        sha1 = "6444e7ca4dbd9899e7eeb5ec3922827ebdc22b3b";
      };
    }
@@ -4062,20 +6708,128 @@
    }
    {
-      name = "psl___psl_1.1.31.tgz";
+      name = "psl___psl_1.8.0.tgz";
+      path = fetchurl {
+        name = "psl___psl_1.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz";
+        sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24";
+      };
+    }
+    {
+      name = "pug_attrs___pug_attrs_2.0.4.tgz";
+      path = fetchurl {
+        name = "pug_attrs___pug_attrs_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.4.tgz";
+        sha1 = "b2f44c439e4eb4ad5d4ef25cac20d18ad28cc336";
+      };
+    }
+    {
+      name = "pug_code_gen___pug_code_gen_2.0.2.tgz";
+      path = fetchurl {
+        name = "pug_code_gen___pug_code_gen_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.2.tgz";
+        sha1 = "ad0967162aea077dcf787838d94ed14acb0217c2";
+      };
+    }
+    {
+      name = "pug_error___pug_error_1.3.3.tgz";
+      path = fetchurl {
+        name = "pug_error___pug_error_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.3.tgz";
+        sha1 = "f342fb008752d58034c185de03602dd9ffe15fa6";
+      };
+    }
+    {
+      name = "pug_filters___pug_filters_3.1.1.tgz";
+      path = fetchurl {
+        name = "pug_filters___pug_filters_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.1.tgz";
+        sha1 = "ab2cc82db9eeccf578bda89130e252a0db026aa7";
+      };
+    }
+    {
+      name = "pug_lexer___pug_lexer_4.1.0.tgz";
+      path = fetchurl {
+        name = "pug_lexer___pug_lexer_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.1.0.tgz";
+        sha1 = "531cde48c7c0b1fcbbc2b85485c8665e31489cfd";
+      };
+    }
+    {
+      name = "pug_linker___pug_linker_3.0.6.tgz";
+      path = fetchurl {
+        name = "pug_linker___pug_linker_3.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.6.tgz";
+        sha1 = "f5bf218b0efd65ce6670f7afc51658d0f82989fb";
+      };
+    }
+    {
+      name = "pug_load___pug_load_2.0.12.tgz";
+      path = fetchurl {
+        name = "pug_load___pug_load_2.0.12.tgz";
+        url  = "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.12.tgz";
+        sha1 = "d38c85eb85f6e2f704dea14dcca94144d35d3e7b";
+      };
+    }
+    {
+      name = "pug_parser___pug_parser_5.0.1.tgz";
+      path = fetchurl {
+        name = "pug_parser___pug_parser_5.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.1.tgz";
+        sha1 = "03e7ada48b6840bd3822f867d7d90f842d0ffdc9";
+      };
+    }
+    {
+      name = "pug_runtime___pug_runtime_2.0.5.tgz";
      path = fetchurl {
-        name = "psl___psl_1.1.31.tgz";
+        name = "pug_runtime___pug_runtime_2.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz";
+        url  = "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.5.tgz";
-        sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184";
+        sha1 = "6da7976c36bf22f68e733c359240d8ae7a32953a";
      };
    }
    {
-      name = "punycode___punycode_1.4.1.tgz";
+      name = "pug_strip_comments___pug_strip_comments_1.0.4.tgz";
      path = fetchurl {
-        name = "punycode___punycode_1.4.1.tgz";
+        name = "pug_strip_comments___pug_strip_comments_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+        sha1 = "cc1b6de1f6e8f5931cf02ec66cdffd3f50eaf8a8";
+      };
+    }
+    {
+      name = "pug_walk___pug_walk_1.1.8.tgz";
+      path = fetchurl {
+        name = "pug_walk___pug_walk_1.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.8.tgz";
+        sha1 = "b408f67f27912f8c21da2f45b7230c4bd2a5ea7a";
+      };
+    }
+    {
+      name = "pug___pug_2.0.4.tgz";
+      path = fetchurl {
+        name = "pug___pug_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/pug/-/pug-2.0.4.tgz";
+        sha1 = "ee7682ec0a60494b38d48a88f05f3b0ac931377d";
+      };
+    }
+    {
+      name = "punycode___punycode_1.3.2.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
      };
    }
@@ -4089,6 +6843,42 @@
    }
    {
+      name = "punycode___punycode_1.2.4.tgz";
+      path = fetchurl {
+        name = "punycode___punycode_1.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/punycode/-/punycode-1.2.4.tgz";
+        sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
+      };
+    }
+    {
+      name = "q___q_1.5.1.tgz";
+      path = fetchurl {
+        name = "q___q_1.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz";
+        sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7";
+      };
+    }
+    {
+      name = "q___q_0.9.7.tgz";
+      path = fetchurl {
+        name = "q___q_0.9.7.tgz";
+        url  = "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz";
+        sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
+      };
+    }
+    {
+      name = "q___q_1.0.1.tgz";
+      path = fetchurl {
+        name = "q___q_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/q/-/q-1.0.1.tgz";
+        sha1 = "11872aeedee89268110b10a718448ffb10112a14";
+      };
+    }
+    {
      name = "qs___qs_5.2.0.tgz";
      path = fetchurl {
        name = "qs___qs_5.2.0.tgz";
@@ -4098,11 +6888,29 @@
    }
    {
-      name = "qs___qs_6.5.2.tgz";
+      name = "qs___qs_6.7.0.tgz";
      path = fetchurl {
-        name = "qs___qs_6.5.2.tgz";
+        name = "qs___qs_6.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz";
-        sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
+        sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc";
+      };
+    }
+    {
+      name = "qs___qs_0.6.6.tgz";
+      path = fetchurl {
+        name = "qs___qs_0.6.6.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz";
+        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      };
+    }
+    {
+      name = "qs___qs_1.0.2.tgz";
+      path = fetchurl {
+        name = "qs___qs_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz";
+        sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
      };
    }
@@ -4116,6 +6924,42 @@
    }
    {
+      name = "qs___qs_2.3.3.tgz";
+      path = fetchurl {
+        name = "qs___qs_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz";
+        sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      };
+    }
+    {
+      name = "qs___qs_6.5.2.tgz";
+      path = fetchurl {
+        name = "qs___qs_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
+        sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
+      };
+    }
+    {
+      name = "querystring_es3___querystring_es3_0.2.0.tgz";
+      path = fetchurl {
+        name = "querystring_es3___querystring_es3_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.0.tgz";
+        sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476";
+      };
+    }
+    {
+      name = "querystring___querystring_0.2.0.tgz";
+      path = fetchurl {
+        name = "querystring___querystring_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz";
+        sha1 = "b209849203bb25df820da756e747005878521620";
+      };
+    }
+    {
      name = "randomatic___randomatic_3.1.1.tgz";
      path = fetchurl {
        name = "randomatic___randomatic_3.1.1.tgz";
@@ -4125,11 +6969,20 @@
    }
    {
-      name = "raw_body___raw_body_2.3.3.tgz";
+      name = "range_parser___range_parser_1.0.3.tgz";
      path = fetchurl {
-        name = "raw_body___raw_body_2.3.3.tgz";
+        name = "range_parser___range_parser_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz";
-        sha1 = "1b324ece6b5706e153855bc1148c65bb7f6ea0c3";
+        sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
+      };
+    }
+    {
+      name = "raw_body___raw_body_2.4.0.tgz";
+      path = fetchurl {
+        name = "raw_body___raw_body_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz";
+        sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332";
      };
    }
@@ -4152,6 +7005,15 @@
    }
    {
+      name = "read_all_stream___read_all_stream_3.1.0.tgz";
+      path = fetchurl {
+        name = "read_all_stream___read_all_stream_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz";
+        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+      };
+    }
+    {
      name = "read_pkg_up___read_pkg_up_1.0.1.tgz";
      path = fetchurl {
        name = "read_pkg_up___read_pkg_up_1.0.1.tgz";
@@ -4170,20 +7032,20 @@
    }
    {
-      name = "readable_stream___readable_stream_1.0.34.tgz";
+      name = "read___read_1.0.7.tgz";
      path = fetchurl {
-        name = "readable_stream___readable_stream_1.0.34.tgz";
+        name = "read___read_1.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz";
+        url  = "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
+        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
      };
    }
    {
-      name = "readable_stream___readable_stream_2.3.6.tgz";
+      name = "readable_stream___readable_stream_1.0.34.tgz";
      path = fetchurl {
-        name = "readable_stream___readable_stream_2.3.6.tgz";
+        name = "readable_stream___readable_stream_1.0.34.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
+        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
      };
    }
@@ -4197,6 +7059,15 @@
    }
    {
+      name = "readable_stream___readable_stream_2.3.7.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_2.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
+      };
+    }
+    {
      name = "readdirp___readdirp_2.2.1.tgz";
      path = fetchurl {
        name = "readdirp___readdirp_2.2.1.tgz";
@@ -4206,6 +7077,15 @@
    }
    {
+      name = "readline2___readline2_0.1.1.tgz";
+      path = fetchurl {
+        name = "readline2___readline2_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/readline2/-/readline2-0.1.1.tgz";
+        sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568";
+      };
+    }
+    {
      name = "rechoir___rechoir_0.6.2.tgz";
      path = fetchurl {
        name = "rechoir___rechoir_0.6.2.tgz";
@@ -4224,6 +7104,24 @@
    }
    {
+      name = "redeyed___redeyed_0.4.4.tgz";
+      path = fetchurl {
+        name = "redeyed___redeyed_0.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/redeyed/-/redeyed-0.4.4.tgz";
+        sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
+      };
+    }
+    {
+      name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz";
+      path = fetchurl {
+        name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9";
+      };
+    }
+    {
      name = "regex_cache___regex_cache_0.4.4.tgz";
      path = fetchurl {
        name = "regex_cache___regex_cache_0.4.4.tgz";
@@ -4242,6 +7140,15 @@
    }
    {
+      name = "registry_url___registry_url_3.1.0.tgz";
+      path = fetchurl {
+        name = "registry_url___registry_url_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+      };
+    }
+    {
      name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
      path = fetchurl {
        name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
@@ -4296,11 +7203,83 @@
    }
    {
-      name = "request___request_2.88.0.tgz";
+      name = "replace_ext___replace_ext_1.0.0.tgz";
      path = fetchurl {
-        name = "request___request_2.88.0.tgz";
+        name = "replace_ext___replace_ext_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz";
+        url  = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz";
-        sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
+        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
+      };
+    }
+    {
+      name = "replacestream___replacestream_4.0.3.tgz";
+      path = fetchurl {
+        name = "replacestream___replacestream_4.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz";
+        sha1 = "3ee5798092be364b1cdb1484308492cb3dff2f36";
+      };
+    }
+    {
+      name = "request_progress___request_progress_0.3.1.tgz";
+      path = fetchurl {
+        name = "request_progress___request_progress_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/request-progress/-/request-progress-0.3.1.tgz";
+        sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
+      };
+    }
+    {
+      name = "request_replay___request_replay_0.2.0.tgz";
+      path = fetchurl {
+        name = "request_replay___request_replay_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/request-replay/-/request-replay-0.2.0.tgz";
+        sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
+      };
+    }
+    {
+      name = "request___request_2.88.2.tgz";
+      path = fetchurl {
+        name = "request___request_2.88.2.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz";
+        sha1 = "d73c918731cb5a87da047e207234146f664d12b3";
+      };
+    }
+    {
+      name = "request___request_2.27.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.27.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.27.0.tgz";
+        sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
+      };
+    }
+    {
+      name = "request___request_2.36.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.36.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.36.0.tgz";
+        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+      };
+    }
+    {
+      name = "request___request_2.40.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.40.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.40.0.tgz";
+        sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
+      };
+    }
+    {
+      name = "request___request_2.51.0.tgz";
+      path = fetchurl {
+        name = "request___request_2.51.0.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.51.0.tgz";
+        sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
      };
    }
@@ -4350,6 +7329,15 @@
    }
    {
+      name = "resolve___resolve_0.6.3.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_0.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz";
+        sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
+      };
+    }
+    {
      name = "resolve___resolve_1.1.7.tgz";
      path = fetchurl {
        name = "resolve___resolve_1.1.7.tgz";
@@ -4359,11 +7347,20 @@
    }
    {
-      name = "resolve___resolve_1.10.0.tgz";
+      name = "resolve___resolve_1.15.1.tgz";
      path = fetchurl {
-        name = "resolve___resolve_1.10.0.tgz";
+        name = "resolve___resolve_1.15.1.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz";
-        sha1 = "3bdaaeaf45cc07f375656dfd2e54ed0810b101ba";
+        sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8";
+      };
+    }
+    {
+      name = "resolve___resolve_0.3.1.tgz";
+      path = fetchurl {
+        name = "resolve___resolve_0.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-0.3.1.tgz";
+        sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4";
      };
    }
@@ -4377,11 +7374,83 @@
    }
    {
-      name = "rimraf___rimraf_2.6.3.tgz";
+      name = "retry___retry_0.6.1.tgz";
+      path = fetchurl {
+        name = "retry___retry_0.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/retry/-/retry-0.6.1.tgz";
+        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+      };
+    }
+    {
+      name = "rfile___rfile_1.0.0.tgz";
+      path = fetchurl {
+        name = "rfile___rfile_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/rfile/-/rfile-1.0.0.tgz";
+        sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261";
+      };
+    }
+    {
+      name = "right_align___right_align_0.1.3.tgz";
+      path = fetchurl {
+        name = "right_align___right_align_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.7.1.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz";
+        sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.2.8.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+    }
+    {
+      name = "rimraf___rimraf_2.4.5.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz";
+        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+      };
+    }
+    {
+      name = "ruglify___ruglify_1.0.0.tgz";
+      path = fetchurl {
+        name = "ruglify___ruglify_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/ruglify/-/ruglify-1.0.0.tgz";
+        sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675";
+      };
+    }
+    {
+      name = "run_sequence___run_sequence_1.1.5.tgz";
+      path = fetchurl {
+        name = "run_sequence___run_sequence_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/run-sequence/-/run-sequence-1.1.5.tgz";
+        sha1 = "556bd47eb47877349e36c9c582748897db7be4f7";
+      };
+    }
+    {
+      name = "safe_buffer___safe_buffer_5.2.0.tgz";
      path = fetchurl {
-        name = "rimraf___rimraf_2.6.3.tgz";
+        name = "safe_buffer___safe_buffer_5.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz";
-        sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
+        sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519";
      };
    }
@@ -4440,11 +7509,20 @@
    }
    {
-      name = "semver___semver_5.6.0.tgz";
+      name = "semver_diff___semver_diff_2.1.0.tgz";
      path = fetchurl {
-        name = "semver___semver_5.6.0.tgz";
+        name = "semver_diff___semver_diff_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha1 = "7e74256fbaa49c75aa7c7a205cc22799cac80004";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    }
+    {
+      name = "semver___semver_5.7.1.tgz";
+      path = fetchurl {
+        name = "semver___semver_5.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz";
+        sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7";
      };
    }
@@ -4458,6 +7536,15 @@
    }
    {
+      name = "semver___semver_2.3.2.tgz";
+      path = fetchurl {
+        name = "semver___semver_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz";
+        sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
+      };
+    }
+    {
      name = "semver___semver_5.3.0.tgz";
      path = fetchurl {
        name = "semver___semver_5.3.0.tgz";
@@ -4467,6 +7554,15 @@
    }
    {
+      name = "send___send_0.13.2.tgz";
+      path = fetchurl {
+        name = "send___send_0.13.2.tgz";
+        url  = "https://registry.yarnpkg.com/send/-/send-0.13.2.tgz";
+        sha1 = "765e7607c8055452bba6f0b052595350986036de";
+      };
+    }
+    {
      name = "sequencify___sequencify_0.0.7.tgz";
      path = fetchurl {
        name = "sequencify___sequencify_0.0.7.tgz";
@@ -4476,6 +7572,15 @@
    }
    {
+      name = "serve_static___serve_static_1.10.3.tgz";
+      path = fetchurl {
+        name = "serve_static___serve_static_1.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.10.3.tgz";
+        sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
+      };
+    }
+    {
      name = "set_blocking___set_blocking_2.0.0.tgz";
      path = fetchurl {
        name = "set_blocking___set_blocking_2.0.0.tgz";
@@ -4485,29 +7590,47 @@
    }
    {
-      name = "set_value___set_value_0.4.3.tgz";
+      name = "set_value___set_value_2.0.1.tgz";
+      path = fetchurl {
+        name = "set_value___set_value_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz";
+        sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b";
+      };
+    }
+    {
+      name = "setprototypeof___setprototypeof_1.1.1.tgz";
      path = fetchurl {
-        name = "set_value___set_value_0.4.3.tgz";
+        name = "setprototypeof___setprototypeof_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz";
-        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
+        sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683";
      };
    }
    {
-      name = "set_value___set_value_2.0.0.tgz";
+      name = "shallow_copy___shallow_copy_0.0.1.tgz";
      path = fetchurl {
-        name = "set_value___set_value_2.0.0.tgz";
+        name = "shallow_copy___shallow_copy_0.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz";
-        sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274";
+        sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
      };
    }
    {
-      name = "setprototypeof___setprototypeof_1.1.0.tgz";
+      name = "shell_quote___shell_quote_0.0.1.tgz";
      path = fetchurl {
-        name = "setprototypeof___setprototypeof_1.1.0.tgz";
+        name = "shell_quote___shell_quote_0.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-0.0.1.tgz";
-        sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656";
+        sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
+      };
+    }
+    {
+      name = "shell_quote___shell_quote_1.4.3.tgz";
+      path = fetchurl {
+        name = "shell_quote___shell_quote_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.4.3.tgz";
+        sha1 = "952c44e0b1ed9013ef53958179cc643e8777466b";
      };
    }
@@ -4521,11 +7644,29 @@
    }
    {
-      name = "signal_exit___signal_exit_3.0.2.tgz";
+      name = "signal_exit___signal_exit_3.0.3.tgz";
+      path = fetchurl {
+        name = "signal_exit___signal_exit_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c";
+      };
+    }
+    {
+      name = "simple_fmt___simple_fmt_0.1.0.tgz";
      path = fetchurl {
-        name = "signal_exit___signal_exit_3.0.2.tgz";
+        name = "simple_fmt___simple_fmt_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        sha1 = "191bf566a59e6530482cb25ab53b4a8dc85c3a6b";
+      };
+    }
+    {
+      name = "simple_is___simple_is_0.2.0.tgz";
+      path = fetchurl {
+        name = "simple_is___simple_is_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz";
+        sha1 = "2abb75aade39deb5cc815ce10e6191164850baf0";
      };
    }
@@ -4557,6 +7698,15 @@
    }
    {
+      name = "sntp___sntp_0.2.4.tgz";
+      path = fetchurl {
+        name = "sntp___sntp_0.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz";
+        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      };
+    }
+    {
      name = "socket.io_adapter___socket.io_adapter_0.5.0.tgz";
      path = fetchurl {
        name = "socket.io_adapter___socket.io_adapter_0.5.0.tgz";
@@ -4593,11 +7743,11 @@
    }
    {
-      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";
+        name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
-        sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259";
+        sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a";
      };
    }
@@ -4611,6 +7761,24 @@
    }
    {
+      name = "source_map___source_map_0.1.34.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.1.34.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.34.tgz";
+        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
+      };
+    }
+    {
+      name = "source_map___source_map_0.1.43.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.1.43.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz";
+        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+      };
+    }
+    {
      name = "source_map___source_map_0.4.4.tgz";
      path = fetchurl {
        name = "source_map___source_map_0.4.4.tgz";
@@ -4647,6 +7815,15 @@
    }
    {
+      name = "source_map___source_map_0.3.0.tgz";
+      path = fetchurl {
+        name = "source_map___source_map_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.3.0.tgz";
+        sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
+      };
+    }
+    {
      name = "sparkles___sparkles_1.0.1.tgz";
      path = fetchurl {
        name = "sparkles___sparkles_1.0.1.tgz";
@@ -4683,11 +7860,11 @@
    }
    {
-      name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz";
+      name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
      path = fetchurl {
-        name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz";
+        name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
-        sha1 = "81c0ce8f21474756148bbb5f3bfc0f36bf15d76e";
+        sha1 = "3694b5804567a458d3c8045842a6358632f62654";
      };
    }
@@ -4701,6 +7878,15 @@
    }
    {
+      name = "split___split_0.3.3.tgz";
+      path = fetchurl {
+        name = "split___split_0.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz";
+        sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
+      };
+    }
+    {
      name = "split___split_1.0.1.tgz";
      path = fetchurl {
        name = "split___split_1.0.1.tgz";
@@ -4728,6 +7914,15 @@
    }
    {
+      name = "stable___stable_0.1.8.tgz";
+      path = fetchurl {
+        name = "stable___stable_0.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz";
+        sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf";
+      };
+    }
+    {
      name = "static_extend___static_extend_0.1.2.tgz";
      path = fetchurl {
        name = "static_extend___static_extend_0.1.2.tgz";
@@ -4746,11 +7941,11 @@
    }
    {
-      name = "statuses___statuses_1.3.1.tgz";
+      name = "statuses___statuses_1.2.1.tgz";
      path = fetchurl {
-        name = "statuses___statuses_1.3.1.tgz";
+        name = "statuses___statuses_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz";
-        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
      };
    }
@@ -4764,6 +7959,15 @@
    }
    {
+      name = "stream_browserify___stream_browserify_0.1.3.tgz";
+      path = fetchurl {
+        name = "stream_browserify___stream_browserify_0.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-0.1.3.tgz";
+        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+      };
+    }
+    {
      name = "stream_combiner___stream_combiner_0.2.2.tgz";
      path = fetchurl {
        name = "stream_combiner___stream_combiner_0.2.2.tgz";
@@ -4773,6 +7977,24 @@
    }
    {
+      name = "stream_combiner___stream_combiner_0.0.4.tgz";
+      path = fetchurl {
+        name = "stream_combiner___stream_combiner_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+      };
+    }
+    {
+      name = "stream_combiner___stream_combiner_0.1.0.tgz";
+      path = fetchurl {
+        name = "stream_combiner___stream_combiner_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.1.0.tgz";
+        sha1 = "0dc389a3c203f8f4d56368f95dde52eb9269b5be";
+      };
+    }
+    {
      name = "stream_consume___stream_consume_0.1.1.tgz";
      path = fetchurl {
        name = "stream_consume___stream_consume_0.1.1.tgz";
@@ -4782,6 +8004,24 @@
    }
    {
+      name = "stream_shift___stream_shift_1.0.1.tgz";
+      path = fetchurl {
+        name = "stream_shift___stream_shift_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha1 = "d7088281559ab2778424279b0877da3c392d5a3d";
+      };
+    }
+    {
+      name = "string_length___string_length_1.0.1.tgz";
+      path = fetchurl {
+        name = "string_length___string_length_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz";
+        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
+      };
+    }
+    {
      name = "string_width___string_width_1.0.2.tgz";
      path = fetchurl {
        name = "string_width___string_width_1.0.2.tgz";
@@ -4800,6 +8040,15 @@
    }
    {
+      name = "string_decoder___string_decoder_0.0.1.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.0.1.tgz";
+        sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141";
+      };
+    }
+    {
      name = "string_decoder___string_decoder_0.10.31.tgz";
      path = fetchurl {
        name = "string_decoder___string_decoder_0.10.31.tgz";
@@ -4818,6 +8067,42 @@
    }
    {
+      name = "stringify_object___stringify_object_0.2.1.tgz";
+      path = fetchurl {
+        name = "stringify_object___stringify_object_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-0.2.1.tgz";
+        sha1 = "b58be50b3ff5f371038c545d4332656bfded5620";
+      };
+    }
+    {
+      name = "stringmap___stringmap_0.2.2.tgz";
+      path = fetchurl {
+        name = "stringmap___stringmap_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz";
+        sha1 = "556c137b258f942b8776f5b2ef582aa069d7d1b1";
+      };
+    }
+    {
+      name = "stringset___stringset_0.2.1.tgz";
+      path = fetchurl {
+        name = "stringset___stringset_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz";
+        sha1 = "ef259c4e349344377fcd1c913dd2e848c9c042b5";
+      };
+    }
+    {
+      name = "stringstream___stringstream_0.0.6.tgz";
+      path = fetchurl {
+        name = "stringstream___stringstream_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz";
+        sha1 = "7880225b0d4ad10e30927d167a1d6f2fd3b33a72";
+      };
+    }
+    {
      name = "strip_ansi___strip_ansi_0.3.0.tgz";
      path = fetchurl {
        name = "strip_ansi___strip_ansi_0.3.0.tgz";
@@ -4827,6 +8112,15 @@
    }
    {
+      name = "strip_ansi___strip_ansi_2.0.1.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-2.0.1.tgz";
+        sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+      };
+    }
+    {
      name = "strip_ansi___strip_ansi_3.0.1.tgz";
      path = fetchurl {
        name = "strip_ansi___strip_ansi_3.0.1.tgz";
@@ -4845,6 +8139,15 @@
    }
    {
+      name = "strip_ansi___strip_ansi_0.1.1.tgz";
+      path = fetchurl {
+        name = "strip_ansi___strip_ansi_0.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+      };
+    }
+    {
      name = "strip_bom___strip_bom_1.0.0.tgz";
      path = fetchurl {
        name = "strip_bom___strip_bom_1.0.0.tgz";
@@ -4881,6 +8184,15 @@
    }
    {
+      name = "subarg___subarg_0.0.1.tgz";
+      path = fetchurl {
+        name = "subarg___subarg_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/subarg/-/subarg-0.0.1.tgz";
+        sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a";
+      };
+    }
+    {
      name = "supports_color___supports_color_0.2.0.tgz";
      path = fetchurl {
        name = "supports_color___supports_color_0.2.0.tgz";
@@ -4908,20 +8220,92 @@
    }
    {
-      name = "tar___tar_2.2.1.tgz";
+      name = "supports_color___supports_color_7.1.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz";
+        sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1";
+      };
+    }
+    {
+      name = "syntax_error___syntax_error_1.1.6.tgz";
+      path = fetchurl {
+        name = "syntax_error___syntax_error_1.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz";
+        sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
+      };
+    }
+    {
+      name = "tar___tar_2.2.2.tgz";
+      path = fetchurl {
+        name = "tar___tar_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz";
+        sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40";
+      };
+    }
+    {
+      name = "tar___tar_4.4.13.tgz";
+      path = fetchurl {
+        name = "tar___tar_4.4.13.tgz";
+        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz";
+        sha1 = "43b364bc52888d555298637b10d60790254ab525";
+      };
+    }
+    {
+      name = "tar___tar_0.1.20.tgz";
+      path = fetchurl {
+        name = "tar___tar_0.1.20.tgz";
+        url  = "https://registry.yarnpkg.com/tar/-/tar-0.1.20.tgz";
+        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+      };
+    }
+    {
+      name = "ternary_stream___ternary_stream_2.1.1.tgz";
+      path = fetchurl {
+        name = "ternary_stream___ternary_stream_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/ternary-stream/-/ternary-stream-2.1.1.tgz";
+        sha1 = "4ad64b98668d796a085af2c493885a435a8a8bfc";
+      };
+    }
+    {
+      name = "textextensions___textextensions_1.0.2.tgz";
+      path = fetchurl {
+        name = "textextensions___textextensions_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/textextensions/-/textextensions-1.0.2.tgz";
+        sha1 = "65486393ee1f2bb039a60cbba05b0b68bd9501d2";
+      };
+    }
+    {
+      name = "throttleit___throttleit_0.0.2.tgz";
      path = fetchurl {
-        name = "tar___tar_2.2.1.tgz";
+        name = "throttleit___throttleit_0.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz";
-        sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
+        sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
      };
    }
    {
-      name = "tar___tar_4.4.8.tgz";
+      name = "through2___through2_0.4.2.tgz";
      path = fetchurl {
-        name = "tar___tar_4.4.8.tgz";
+        name = "through2___through2_0.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz";
-        sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d";
+        sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
+      };
+    }
+    {
+      name = "through2___through2_0.5.1.tgz";
+      path = fetchurl {
+        name = "through2___through2_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz";
+        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
      };
    }
@@ -4953,6 +8337,15 @@
    }
    {
+      name = "through___through_2.2.7.tgz";
+      path = fetchurl {
+        name = "through___through_2.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz";
+        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+      };
+    }
+    {
      name = "tildify___tildify_1.2.0.tgz";
      path = fetchurl {
        name = "tildify___tildify_1.2.0.tgz";
@@ -4971,6 +8364,42 @@
    }
    {
+      name = "timed_out___timed_out_2.0.0.tgz";
+      path = fetchurl {
+        name = "timed_out___timed_out_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz";
+        sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
+      };
+    }
+    {
+      name = "timers_browserify___timers_browserify_1.0.3.tgz";
+      path = fetchurl {
+        name = "timers_browserify___timers_browserify_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.0.3.tgz";
+        sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
+      };
+    }
+    {
+      name = "timers_ext___timers_ext_0.1.7.tgz";
+      path = fetchurl {
+        name = "timers_ext___timers_ext_0.1.7.tgz";
+        url  = "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz";
+        sha1 = "6f57ad8578e07a3fb9f91d9387d65647555e25c6";
+      };
+    }
+    {
+      name = "tmp___tmp_0.0.23.tgz";
+      path = fetchurl {
+        name = "tmp___tmp_0.0.23.tgz";
+        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.23.tgz";
+        sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
+      };
+    }
+    {
      name = "tmp___tmp_0.0.33.tgz";
      path = fetchurl {
        name = "tmp___tmp_0.0.33.tgz";
@@ -4989,6 +8418,15 @@
    }
    {
+      name = "to_fast_properties___to_fast_properties_1.0.3.tgz";
+      path = fetchurl {
+        name = "to_fast_properties___to_fast_properties_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
+        sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
+      };
+    }
+    {
      name = "to_object_path___to_object_path_0.3.0.tgz";
      path = fetchurl {
        name = "to_object_path___to_object_path_0.3.0.tgz";
@@ -5016,11 +8454,56 @@
    }
    {
-      name = "tough_cookie___tough_cookie_2.4.3.tgz";
+      name = "toidentifier___toidentifier_1.0.0.tgz";
      path = fetchurl {
-        name = "tough_cookie___tough_cookie_2.4.3.tgz";
+        name = "toidentifier___toidentifier_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz";
-        sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781";
+        sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553";
+      };
+    }
+    {
+      name = "token_stream___token_stream_0.0.1.tgz";
+      path = fetchurl {
+        name = "token_stream___token_stream_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz";
+        sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
+      };
+    }
+    {
+      name = "touch___touch_0.0.2.tgz";
+      path = fetchurl {
+        name = "touch___touch_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/touch/-/touch-0.0.2.tgz";
+        sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_4.0.0.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz";
+        sha1 = "d822234eeca882f991f0f908824ad2622ddbece4";
+      };
+    }
+    {
+      name = "tough_cookie___tough_cookie_2.5.0.tgz";
+      path = fetchurl {
+        name = "tough_cookie___tough_cookie_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2";
+      };
+    }
+    {
+      name = "traverse___traverse_0.3.9.tgz";
+      path = fetchurl {
+        name = "traverse___traverse_0.3.9.tgz";
+        url  = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz";
+        sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
      };
    }
@@ -5043,6 +8526,24 @@
    }
    {
+      name = "tryor___tryor_0.1.2.tgz";
+      path = fetchurl {
+        name = "tryor___tryor_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz";
+        sha1 = "8145e4ca7caff40acde3ccf946e8b8bb75b4172b";
+      };
+    }
+    {
+      name = "tty_browserify___tty_browserify_0.0.1.tgz";
+      path = fetchurl {
+        name = "tty_browserify___tty_browserify_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz";
+        sha1 = "3f05251ee17904dfd0677546670db9651682b811";
+      };
+    }
+    {
      name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
      path = fetchurl {
        name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
@@ -5052,6 +8553,24 @@
    }
    {
+      name = "tunnel_agent___tunnel_agent_0.3.0.tgz";
+      path = fetchurl {
+        name = "tunnel_agent___tunnel_agent_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      };
+    }
+    {
+      name = "tunnel_agent___tunnel_agent_0.4.3.tgz";
+      path = fetchurl {
+        name = "tunnel_agent___tunnel_agent_0.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+      };
+    }
+    {
      name = "tweetnacl___tweetnacl_0.14.5.tgz";
      path = fetchurl {
        name = "tweetnacl___tweetnacl_0.14.5.tgz";
@@ -5070,20 +8589,110 @@
    }
    {
-      name = "type_is___type_is_1.6.16.tgz";
+      name = "type_is___type_is_1.6.18.tgz";
+      path = fetchurl {
+        name = "type_is___type_is_1.6.18.tgz";
+        url  = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz";
+        sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131";
+      };
+    }
+    {
+      name = "type___type_1.2.0.tgz";
      path = fetchurl {
-        name = "type_is___type_is_1.6.16.tgz";
+        name = "type___type_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz";
+        url  = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz";
-        sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194";
+        sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0";
      };
    }
    {
-      name = "uglify_js___uglify_js_3.4.9.tgz";
+      name = "type___type_2.0.0.tgz";
      path = fetchurl {
-        name = "uglify_js___uglify_js_3.4.9.tgz";
+        name = "type___type_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz";
+        url  = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz";
-        sha1 = "af02f180c1207d76432e473ed24a28f4a782bae3";
+        sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3";
+      };
+    }
+    {
+      name = "typedarray___typedarray_0.0.6.tgz";
+      path = fetchurl {
+        name = "typedarray___typedarray_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.5.0.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.5.0.tgz";
+        sha1 = "4ab5d65a4730ecb7a4fb62d3f499e2054d98fba1";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.8.29.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.8.29.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz";
+        sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_3.8.1.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_3.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.1.tgz";
+        sha1 = "43bb15ce6f545eaa0a64c49fd29375ea09fa0f93";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.2.5.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.2.5.tgz";
+        sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.3.6.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+      };
+    }
+    {
+      name = "uglify_js___uglify_js_2.4.24.tgz";
+      path = fetchurl {
+        name = "uglify_js___uglify_js_2.4.24.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.4.24.tgz";
+        sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
+      };
+    }
+    {
+      name = "uglify_save_license___uglify_save_license_0.4.1.tgz";
+      path = fetchurl {
+        name = "uglify_save_license___uglify_save_license_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-save-license/-/uglify-save-license-0.4.1.tgz";
+        sha1 = "95726c17cc6fd171c3617e3bf4d8d82aa8c4cce1";
+      };
+    }
+    {
+      name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
+      path = fetchurl {
+        name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
      };
    }
@@ -5097,6 +8706,15 @@
    }
    {
+      name = "umd___umd_2.0.0.tgz";
+      path = fetchurl {
+        name = "umd___umd_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/umd/-/umd-2.0.0.tgz";
+        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+      };
+    }
+    {
      name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
      path = fetchurl {
        name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
@@ -5106,11 +8724,29 @@
    }
    {
-      name = "union_value___union_value_1.0.0.tgz";
+      name = "underscore.string___underscore.string_2.4.0.tgz";
+      path = fetchurl {
+        name = "underscore.string___underscore.string_2.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz";
+        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+      };
+    }
+    {
+      name = "underscore___underscore_1.7.0.tgz";
+      path = fetchurl {
+        name = "underscore___underscore_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz";
+        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+      };
+    }
+    {
+      name = "union_value___union_value_1.0.1.tgz";
      path = fetchurl {
-        name = "union_value___union_value_1.0.0.tgz";
+        name = "union_value___union_value_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz";
-        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+        sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847";
      };
    }
@@ -5124,6 +8760,15 @@
    }
    {
+      name = "universalify___universalify_0.1.2.tgz";
+      path = fetchurl {
+        name = "universalify___universalify_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz";
+        sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66";
+      };
+    }
+    {
      name = "unpipe___unpipe_1.0.0.tgz";
      path = fetchurl {
        name = "unpipe___unpipe_1.0.0.tgz";
@@ -5142,6 +8787,15 @@
    }
    {
+      name = "update_notifier___update_notifier_0.2.2.tgz";
+      path = fetchurl {
+        name = "update_notifier___update_notifier_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.2.2.tgz";
+        sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187";
+      };
+    }
+    {
      name = "uri_js___uri_js_4.2.2.tgz";
      path = fetchurl {
        name = "uri_js___uri_js_4.2.2.tgz";
@@ -5160,6 +8814,15 @@
    }
    {
+      name = "url___url_0.10.3.tgz";
+      path = fetchurl {
+        name = "url___url_0.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz";
+        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
+      };
+    }
+    {
      name = "use___use_3.1.1.tgz";
      path = fetchurl {
        name = "use___use_3.1.1.tgz";
@@ -5196,6 +8859,24 @@
    }
    {
+      name = "util___util_0.10.3.tgz";
+      path = fetchurl {
+        name = "util___util_0.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    }
+    {
+      name = "util___util_0.10.4.tgz";
+      path = fetchurl {
+        name = "util___util_0.10.4.tgz";
+        url  = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz";
+        sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901";
+      };
+    }
+    {
      name = "utils_merge___utils_merge_1.0.1.tgz";
      path = fetchurl {
        name = "utils_merge___utils_merge_1.0.1.tgz";
@@ -5205,11 +8886,29 @@
    }
    {
-      name = "uuid___uuid_3.3.2.tgz";
+      name = "uuid___uuid_2.0.3.tgz";
      path = fetchurl {
-        name = "uuid___uuid_3.3.2.tgz";
+        name = "uuid___uuid_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz";
-        sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
+        sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
+      };
+    }
+    {
+      name = "uuid___uuid_3.4.0.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+        sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
+      };
+    }
+    {
+      name = "uuid___uuid_1.4.2.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_1.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz";
+        sha1 = "453019f686966a6df83cdc5244e7c990ecc332fc";
      };
    }
@@ -5250,6 +8949,15 @@
    }
    {
+      name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.1.4.tgz";
+      path = fetchurl {
+        name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz";
+        sha1 = "c5fcbd43e2f238423c2dc98bddd6f79b72bc345b";
+      };
+    }
+    {
      name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
      path = fetchurl {
        name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
@@ -5259,6 +8967,15 @@
    }
    {
+      name = "vinyl___vinyl_0.2.3.tgz";
+      path = fetchurl {
+        name = "vinyl___vinyl_0.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz";
+        sha1 = "bca938209582ec5a49ad538a00fa1f125e513252";
+      };
+    }
+    {
      name = "vinyl___vinyl_0.4.6.tgz";
      path = fetchurl {
        name = "vinyl___vinyl_0.4.6.tgz";
@@ -5277,6 +8994,33 @@
    }
    {
+      name = "vinyl___vinyl_1.2.0.tgz";
+      path = fetchurl {
+        name = "vinyl___vinyl_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz";
+        sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
+      };
+    }
+    {
+      name = "vinyl___vinyl_2.2.0.tgz";
+      path = fetchurl {
+        name = "vinyl___vinyl_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
+        sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
+      };
+    }
+    {
+      name = "vm_browserify___vm_browserify_0.0.4.tgz";
+      path = fetchurl {
+        name = "vm_browserify___vm_browserify_0.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz";
+        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+      };
+    }
+    {
      name = "void_elements___void_elements_2.0.1.tgz";
      path = fetchurl {
        name = "void_elements___void_elements_2.0.1.tgz";
@@ -5286,11 +9030,11 @@
    }
    {
-      name = "websocket_driver___websocket_driver_0.7.0.tgz";
+      name = "websocket_driver___websocket_driver_0.7.3.tgz";
      path = fetchurl {
-        name = "websocket_driver___websocket_driver_0.7.0.tgz";
+        name = "websocket_driver___websocket_driver_0.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz";
-        sha1 = "0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb";
+        sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9";
      };
    }
@@ -5322,6 +9066,15 @@
    }
    {
+      name = "which___which_1.0.9.tgz";
+      path = fetchurl {
+        name = "which___which_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/which/-/which-1.0.9.tgz";
+        sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+      };
+    }
+    {
      name = "wide_align___wide_align_1.1.3.tgz";
      path = fetchurl {
        name = "wide_align___wide_align_1.1.3.tgz";
@@ -5331,6 +9084,42 @@
    }
    {
+      name = "window_size___window_size_0.1.0.tgz";
+      path = fetchurl {
+        name = "window_size___window_size_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    }
+    {
+      name = "with___with_5.1.1.tgz";
+      path = fetchurl {
+        name = "with___with_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz";
+        sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
+      };
+    }
+    {
+      name = "word_wrap___word_wrap_1.2.3.tgz";
+      path = fetchurl {
+        name = "word_wrap___word_wrap_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c";
+      };
+    }
+    {
+      name = "wordwrap___wordwrap_0.0.2.tgz";
+      path = fetchurl {
+        name = "wordwrap___wordwrap_0.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    }
+    {
      name = "wordwrap___wordwrap_1.0.0.tgz";
      path = fetchurl {
        name = "wordwrap___wordwrap_1.0.0.tgz";
@@ -5385,6 +9174,15 @@
    }
    {
+      name = "xdg_basedir___xdg_basedir_1.0.1.tgz";
+      path = fetchurl {
+        name = "xdg_basedir___xdg_basedir_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-1.0.1.tgz";
+        sha1 = "14ff8f63a4fdbcb05d5b6eea22b36f3033b9f04e";
+      };
+    }
+    {
      name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.3.tgz";
      path = fetchurl {
        name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.3.tgz";
@@ -5394,11 +9192,29 @@
    }
    {
-      name = "xtend___xtend_4.0.1.tgz";
+      name = "xtend___xtend_4.0.2.tgz";
+      path = fetchurl {
+        name = "xtend___xtend_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz";
+        sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54";
+      };
+    }
+    {
+      name = "xtend___xtend_3.0.0.tgz";
      path = fetchurl {
-        name = "xtend___xtend_4.0.1.tgz";
+        name = "xtend___xtend_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      };
+    }
+    {
+      name = "xtend___xtend_2.1.2.tgz";
+      path = fetchurl {
+        name = "xtend___xtend_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz";
+        sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
      };
    }
@@ -5421,11 +9237,11 @@
    }
    {
-      name = "yallist___yallist_3.0.3.tgz";
+      name = "yallist___yallist_3.1.1.tgz";
      path = fetchurl {
-        name = "yallist___yallist_3.0.3.tgz";
+        name = "yallist___yallist_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz";
-        sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9";
+        sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd";
      };
    }
@@ -5448,6 +9264,24 @@
    }
    {
+      name = "yargs___yargs_3.10.0.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_3.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    }
+    {
+      name = "yargs___yargs_3.5.4.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_3.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-3.5.4.tgz";
+        sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+      };
+    }
+    {
      name = "yeast___yeast_0.1.2.tgz";
      path = fetchurl {
        name = "yeast___yeast_0.1.2.tgz";
diff --git a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch b/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
deleted file mode 100644
index 2a08a5c..0000000
--- a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
-index 3af9edd3b8c4ad9074113273175098841af6a28e..8c1d84012b035f7bc7faedcb24916581a02a5d3e 100644
--- a/inc/ui/collection-edit.php
-+++ b/inc/ui/collection-edit.php
-@@ -190,7 +190,7 @@ $privilege_xlate = array(
- * @param dbrow $row The row object we read from the database.
- * @return string The formatted privileges.
- */
-function collection_privilege_format_function( $value, $column, $row ) {
-+function collection_privilege_format_function( $value, $column = NULL, $row = NULL ) {
-   global $privilege_xlate;
- 
-   $privs = bits_to_privilege($value, 'calendar');
-diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
-index 20dee7fa4ca2235ff2f74be0dfb52cbe937ef822..2e37cd596b597bcce1e59d7c02a1c5fc2a7f88ce 100644
--- a/inc/ui/principal-edit.php
-+++ b/inc/ui/principal-edit.php
-@@ -454,7 +454,7 @@ EOTEMPLATE;
- * @param dbrow $row The row object we read from the database.
- * @return string The formatted privileges.
- */
-function principal_privilege_format_function( $value, $column, $row ) {
-+function principal_privilege_format_function( $value, $column = NULL, $row = NULL ) {
-   global $privilege_xlate;
- 
-   $privs = bits_to_privilege($value,'*');
diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
index 52d8736..6735553 100644
--- a/pkgs/webapps/davical/default.nix
+++ b/pkgs/webapps/davical/default.nix
@@ -1,16 +1,15 @@
 { davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
 stdenv.mkDerivation rec {
-  version = "1.1.7";
+  version = "1.1.9.2";
  name = "davical-${version}";
  src = fetchurl {
    url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz";
-    sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9";
+    sha256 = "133p7fl544df2rqw1nbnj5nj6bvb9kng9q0c3iqrqlpawq3a6ilh";
  };
  unpackCmd = ''
    tar --one-top-level -xf $curSrc
  '';
  makeFlags = "all";
-  patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ];
  installPhase = ''
    mkdir -p $out
    cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
diff --git a/pkgs/webapps/diaspora/default.nix b/pkgs/webapps/diaspora/default.nix
index eff8d27..b435347 100644
--- a/pkgs/webapps/diaspora/default.nix
+++ b/pkgs/webapps/diaspora/default.nix
@@ -15,10 +15,6 @@ let
  });
  gems = bundlerEnv {
    name = "diaspora-env";
-    # https://git.immae.eu/mantisbt/view.php?id=131
-    ruby = ruby_2_4.overrideAttrs(old: {
-      postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall;
-    });
    gemfile = "${diaspora_src}/Gemfile";
    lockfile = "${diaspora_src}/Gemfile.lock";
    gemset = if ldap then ./gemset_ldap.nix else ./gemset.nix;
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index 643daed..f6393fe 100644
--- a/pkgs/webapps/mediagoblin/default.nix
+++ b/pkgs/webapps/mediagoblin/default.nix
@@ -2,6 +2,15 @@
 let
  overridePython = let
    packageOverrides = self: super: {
+      pybcrypt = super.buildPythonPackage rec {
+        pname = "pybcrypt";
+        version = "0.4";
+        src = self.fetchPypi {
+          inherit pname version;
+          sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78";
+        };
+      };
      celery = super.celery.overridePythonAttrs(old: rec {
        version = "3.1.26.post2";
        src = self.fetchPypi {
@@ -45,6 +54,7 @@ let
          inherit (old) pname;
          sha256 = "8b0ec71af9291191ba83a91c03d157b19ab3e7119e27da97932a4773a3f664a9";
        };
+        doCheck = false;
      });
      tempita_5_3_dev = super.buildPythonPackage (mylibs.fetchedGithub ./tempita.json // rec {
        buildInputs = with self; [ nose ];
diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix
index a04d490..8995419 100644
--- a/pkgs/webapps/peertube/default.nix
+++ b/pkgs/webapps/peertube/default.nix
@@ -3,7 +3,7 @@
 let
  nodeHeaders = fetchurl {
    url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-    sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
+    sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj";
  };
  patchedPackages = stdenv.mkDerivation (mylibs.fetchedGithub ./peertube.json // rec {
    patches = if ldap then [ ./ldap.patch ././yarn_fix_bluebird_ldap.patch ] else [ ./yarn_fix_bluebird.patch ];
@@ -33,8 +33,8 @@ let
        buildInputs = [ nodePackages.node-pre-gyp ];
        postInstall = let
          bcrypt_lib = fetchurl {
-            url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.2/bcrypt_lib-v3.0.2-node-v57-linux-x64-glibc.tar.gz";
+            url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.2/bcrypt_lib-v3.0.2-node-v64-linux-x64-glibc.tar.gz";
-            sha256 = "04bj3yn1wi8a6izihskyks0bb4nls3mndgb2yj12iraiv5dmg097";
+            sha256 = "0i0dx4h52fqi3mda2zzqrxp2fh7spbvf7h88mjk218h8d7vl53yx";
          };
        in
          ''
author	Ismaël Bouya <ismael.bouya@normalesup.org>	2020-03-25 11:57:48 +0100
committer	Ismaël Bouya <ismael.bouya@normalesup.org>	2020-04-03 16:25:07 +0200
commit	5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch)
tree	6ed072da7b1f17ac3994ffea052aa0c0822f8446
parent	441da8aac378f401625e82caf281fa0e26128310 (diff)
download	Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip